Cleaning up from the travis fiasco

.gitignore

@@ -411,4 +411,5 @@ ASALocalRun/
 
 NuGetScratch/
 VBCSCompiler/
-.dotnet/
+.dotnet/
+release/

ZDragon.NET.sln

@@ -16,8 +16,9 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		.travis.yml = .travis.yml
 		release.sh = release.sh
 		github_release.sh = github_release.sh
-		local_release.sh = local_release.sh
 		clean.sh = clean.sh
+		local_release_TEMP.sh = local_release_TEMP.sh
+		local_release.sh = local_release.sh
 	EndProjectSection
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Mapper.XSD", "Mapper.XSD\Mapper.XSD.csproj", "{CC0033CB-E0DD-435D-B3E6-84C2A33DFBFC}"

local_release.sh

@@ -1,26 +1,12 @@
-#!/bin/bash -i
-RED='\033[0;31m'
-NOCOLOR='\033[0m'
-if [ -z ${ZDRAGON_PATH} ]; then
-    read -p "Please enter your ZDragon.NET source path (folder with the dotnet solution): `echo $'\n'`" -e
-    if [ ! $(ls -a $REPLY | grep .sln) ] || [ ! $(ls -a $REPLY | grep CLI) ] ; then
-        echo "This is not a valid dotnet solution, or it does not contain the ZDragon.NET solution. Exiting."
-        exit 1;
-    fi
-    ZDRAGON_PATH=$REPLY
-    read -p "Would you like to add this path to your bash profile to be re-used in the next start? (y/n) `echo $'\n'`" -n 1 -r -e
-    if [[ $REPLY =~ ^[Yy]$ ]]; then
-        echo -e "export ZDRAGON_PATH=$ZDRAGON_PATH\n" >> $HOME/.bash_profile
-        echo -e "${RED}Please run 'source ~/.bash_profile'. This will prevent you from needing to re-do this the next run.${NOCOLOR}"
-    fi
-fi
+# The following variables are defaults, but can be overwritten as cli arguments, such as by running zdragon_release /usr/local/tempBinForDev
+# This can be useful for one-time changes, but it is recommended to just edit the file if you want to do this often.
 
+# Default bin location for mac
 OUTPUT_DIR="${1:-/usr/local/bin/}"
 # Defaults to mac
 OS="${2:-osx-x64}"
-# assumes that the path ends with /
-CLI_PATH=${ZDRAGON_PATH}CLI
-SOURCE_DIR="${3:-$CLI_PATH}"
+# If your zdragon source location differs from this, edit this variable.
+SOURCE_DIR="${3:-$HOME/Projects/dotnet/ZDragon.NET/CLI}"
 APP_NAME="${4:-ckc}"
 dotnet publish "$SOURCE_DIR" -c Release --runtime "$OS" /p:PublishSingleFile=true -o "$OUTPUT_DIR"
 mv -v "$OUTPUT_DIR"CLI "$OUTPUT_DIR""$APP_NAME"

local_release_TEMP.sh

@@ -0,0 +1,26 @@
+#!/bin/bash -i
+RED='\033[0;31m'
+NOCOLOR='\033[0m'
+if [ -z ${ZDRAGON_PATH} ]; then
+    read -p "Please enter your ZDragon.NET source path (folder with the dotnet solution): `echo $'\n'`" -e
+    if [ ! $(ls -a $REPLY | grep .sln) ] || [ ! $(ls -a $REPLY | grep CLI) ] ; then
+        echo "This is not a valid dotnet solution, or it does not contain the ZDragon.NET solution. Exiting."
+        exit 1;
+    fi
+    ZDRAGON_PATH=$REPLY
+    read -p "Would you like to add this path to your bash profile to be re-used in the next start? (y/n) `echo $'\n'`" -n 1 -r -e
+    if [[ $REPLY =~ ^[Yy]$ ]]; then
+        echo -e "export ZDRAGON_PATH=$ZDRAGON_PATH\n" >> $HOME/.bash_profile
+        echo -e "${RED}Please run 'source ~/.bash_profile'. This will prevent you from needing to re-do this the next run.${NOCOLOR}"
+    fi
+fi
+
+OUTPUT_DIR="${1:-/usr/local/bin/}"
+# Defaults to mac
+OS="${2:-osx-x64}"
+# assumes that the path ends with /
+CLI_PATH=${ZDRAGON_PATH}CLI
+SOURCE_DIR="${3:-$CLI_PATH}"
+APP_NAME="${4:-ckc}"
+dotnet publish "$SOURCE_DIR" -c Release --runtime "$OS" /p:PublishSingleFile=true -o "$OUTPUT_DIR"
+mv -v "$OUTPUT_DIR"CLI "$OUTPUT_DIR""$APP_NAME"