Try to improve the scripts.

Author: Aleksi Salmela

scripts/autocompletion.sh

@@ -10,8 +10,6 @@ _tmc_opts()
 	local cur
 	local sub_command
 	local main_args
-	# Pointer to current completion word.
-	# By convention, it's named "cur" but this isn't strictly necessary.
 
 	COMPREPLY=()
 	cur="\${COMP_WORDS[COMP_CWORD]}"

scripts/stub.sh

@@ -2,9 +2,13 @@
 
 set -euo pipefail
 
+## Embeded binary magic
+
 MYSELF=$(which "$0" 2>/dev/null)
 [ $? -gt 0 ] && [ -f "$0" ] && MYSELF="./$0"
 
+## Find the java binary and correct version
+
 JAVA_BIN=java
 JAVA_HOME=${JAVA_HOME-}
 if [ -n "$JAVA_HOME" ]; then
@@ -22,21 +26,7 @@ if [ "$JAVA_VERSION" \< "1.7" ]; then
     exit 1
 fi
 
-AUTOCOMPLETE="$HOME/.tmc-autocomplete.sh"
-
-# this is used in autocompletion file
-SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-
-tmc_update_autocomplete() {
-	cat > "$AUTOCOMPLETE" <<- EOM
-TMC_AUTOCOMPLETE_SH
-EOM
-	chmod +x "$AUTOCOMPLETE"
-}
-
-tmc_update() {
-	tmc_update_autocomplete
-}
+## find the place for running the autocomplete/alias file
 
 tmc_detect_profile() {
 	local PROFILE_ENV
@@ -89,54 +79,104 @@ tmc_detect_profile() {
 	fi
 }
 
-# create the alias and autocompletion code if tmc alias not set
-if ! type tmc &> /dev/null; then
-	tmc_update_autocomplete
+## Bash autocompletion script extraction
+
+# This is used in autocompletion file
+SCRIPT_PATH="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
+
+tmc_autocomplete_file() {
+	echo "${TMC_AUTOCOMPLETE_FILE-$HOME/.tmc-autocomplete.sh}"
+}
+
+## Create the alias and autocompletion code if tmc alias not set
+tmc_update_autocomplete() {
+	local AUTOCOMPLETE_FILE
+	local PROFILE_FILE
+
+	AUTOCOMPLETE_FILE="$(tmc_autocomplete_file)"
+
+	cat > "$AUTOCOMPLETE_FILE" <<- EOM
+#EMBED_AUTOCOMPLETE_SH
+EOM
+	chmod +x "$AUTOCOMPLETE_FILE"
 
 	PROFILE_FILE=$(tmc_detect_profile)
+
+	# get the aliases
+	set +euo pipefail
+	source $PROFILE_FILE
+	set -euo pipefail
+
+	if type tmc &> /dev/null; then
+		exit
+	fi
+
 	if [ -z "$PROFILE_FILE" ]; then
-		echo "Profile file not found"
-		echo "Put the \"source $AUTOCOMPLETE\" line in somewhere where"
-		echo "it's run at terminal initialization."
+		echo "Profile file not found" >&2
+		echo "Put the \"source $AUTOCOMPLETE_FILE\" line in somewhere where" >&2
+		echo "it's run at terminal initialization." >&2
 	fi
-	echo "source $AUTOCOMPLETE" >> "$PROFILE_FILE"
-fi
+	echo "source $AUTOCOMPLETE_FILE" >> "$PROFILE_FILE"
 
-if [ "${1-}" == "++internal-update" ]; then
-	echo "Please report any error messages that may come up below."
+	echo "To use new autocompletion run the following on command line:" >&2
+	echo ". ~/.bashrc" >&2
+}
+
+## Auto update code
+
+##### If you MODIFY the install script then do the following:
+##### Enable the "THE INSTALL SCRIPT DEBUGGING LINE" at [Tmc]CliUpdater.java
+##### (It runs the dev script instead of the latest release script)
+##### And use the --force-update flag in application.
+
+tmc_update() {
+	tmc_update_autocomplete
+}
+
+tmc_install_update() {
+	echo "Please report any error messages that may come up below." >&2
 	if [ ! -f tmc.new ]; then
-		echo "Could not find the updated file."
+		echo "Could not find the updated file." >&2
 		exit 127
 	fi
 
-	echo "Moving the tmc files..."
-	if mv tmc tmc.orig; then
-		echo "Failed to backup the original tmc binary"
+	echo "Moving the tmc files..." >&2
+	if ! mv tmc tmc.orig; then
+		echo "Failed to backup the original tmc binary" >&2
 		exit 128
 	fi
-	if mv tmc.new tmc; then
-		echo "Failed to replace the original binary with new version"
-		echo "You can replace manually the $PWD/tmc with $PWD/tmc.new"
+	if ! mv tmc.new tmc; then
+		echo "Failed to replace the original binary with new version" >&2
+		echo "You can replace manually the $PWD/tmc with $PWD/tmc.new" >&2
 		exit 129
 	fi
 
 	rm tmc.orig &> /dev/null
-	echo "Running the new tmc update script..."
+	echo "Running the new tmc update script..." >&2
+	echo "" >&2
 	tmc_update
 
 	echo ""
 	if [ -f tmc ]; then
-		echo "Tmc cli installation was successful"
-		#echo ""
-		#echo "To use new autocompletion run the following on command line:"
-		#echo ". ~/.bashrc"
+		echo "Tmc cli installation was successful" >&2
 	else
-		echo "Tmc cli installation failed."
+		echo "Tmc cli installation failed." >&2
 		exit 127
 	fi
 	exit
+}
+
+if [ "${1-}" == "++internal-update" ]; then
+	tmc_install_update
 fi
 
+if [ ! -f "$(tmc_autocomplete_file)" ]; then
+	tmc_update_autocomplete
+	exit
+fi
+
+#EMBED_UNIT_TESTS_SH
+
 export COLUMNS=$(tput cols)
 exec "$JAVA_BIN" -jar "$MYSELF" "$@"
 

scripts/unit_tests.sh

@@ -0,0 +1,9 @@
+#TODO
+
+#backup the profile and the autocompletion if the exist
+
+#try out the functions with different parameters
+
+#restore the files
+
+exit

scripts/wrapper.sh

@@ -5,9 +5,23 @@ set -euo pipefail
 # find newest jar file
 jar_file=$(ls -t target/tmc-cli-*.jar | head -1)
 
-sed '/TMC_AUTOCOMPLETE_SH/ {
-	r scripts/autocompletion.sh
-d }' scripts/stub.sh > tmc
+quotePerlSubst() {
+	IFS= read -d '' -r < <(sed -e ':a' -e '$!{N;ba' -e '}' -e 's/[$/\]/\\&/g; s/\n/\\&/g' <<<"$1")
+	printf %s "${REPLY%$'\n'}"
+}
+
+content=$(cat scripts/stub.sh)
+
+ac_content=$(quotePerlSubst "$(cat scripts/autocompletion.sh)")
+content=$(echo "$content" | sed "s/\#EMBED_AUTOCOMPLETE_SH/$ac_content/g")
+
+if [ "${1-}" = "--with-unit-tests" ] ; then
+	ac_content=$(quotePerlSubst "$(cat scripts/unit_tests.sh)")
+	content=$(echo "$content" | \
+		sed "s/\#EMBED_UNIT_TESTS_SH/$ac_content/g")
+fi
+
+echo "$content" > tmc
 
 cat "$jar_file" >> tmc && chmod +x tmc
 

src/main/java/fi/helsinki/cs/tmc/cli/updater/TmcCliUpdater.java

@@ -86,6 +86,9 @@ public boolean run() {
             return false;
         }
 
+        // Below is "THE INSTALL SCRIPT DEBUGGING LINE"
+        //destination = new File(currentBinLocation + "tmc");
+
         io.println("Running " + destination.getAbsolutePath());
         return runNewTmcCliBinary(destination.getAbsolutePath());
     }