61-alpha5.7

reinstall-esp-idf.sh

@@ -197,7 +197,8 @@ function handleSetupEnvironment() {
 function handleAliasEnviron() {
 	alias get_idf 2>/dev/null
 	ret=$?
-	if [ $ret -eq 1 ]; then
+	echo -e "\n$ret\n"
+	if [ $ret -gt 0 ]; then
 		writeToLog "get_idf alias not found, appending to $rcFile"
 		echo -e "\nalias get_idf='. ${exportScript}'" >> $rcFile
 		returnStatus
@@ -207,7 +208,8 @@ function handleAliasEnviron() {
 
 	alias run_esp_reinstall 2>/dev/null
 	ret=$?
-	if [ $ret -eq 1 ]; then
+	echo -e "\n$ret\n"
+	if [ $ret -gt 0 ]; then
 		writeToLog "run_esp_reinstall alias not found, appending to $rcFile"
 		echo "alias run_esp_reinstall='git -C $runningDir pull; cat $runningDir/version.txt; bash $runningDir/reinstall-esp-idf.sh '" >> $rcFile
 		returnStatus
@@ -219,7 +221,8 @@ function handleAliasEnviron() {
 
 	alias esp_monitor 2>/dev/null
 	ret=$?
-	if [ $ret -eq 1 ]; then
+	echo -e "\n$ret\n"
+	if [ $ret -gt 0 ]; then
 		writeToLog "esp_monitor alias not found, appending to $rcFile"
 		echo "alias esp_monitor='tail -n 75 -f $installDir/install.log'" >> $rcFile
 		returnStatus
@@ -231,7 +234,8 @@ function handleAliasEnviron() {
 
 	alias esp_logs 2>/dev/null
 	ret=$?
-	if [ $ret -eq 1 ]; then
+	echo -e "\n$ret\n"
+	if [ $ret -gt 0 ]; then
 		writeToLog "esp_logs alias not found, appending to $rcFile"
 		echo "alias esp_logs='less $installDir/install.log; less $installDir/version-data.txt'" >> $rcFile
 		returnStatus
@@ -430,7 +434,7 @@ function handleEnd() {
 	endTime=$(date '+%s')
 	timeElapsed=$(($endTime-$startTime))
 
-	echo -e "\nesp-idf re/installed! run \`source $rcFile\` and then \`get_idf\`\n\nAll done :3\n\n"
+	echo -e "\nesp-idf (re)installed! run \`source $rcFile\` and then \`get_idf\`\n\nAll done :3\n\n"
 
 	writeToLog "reinstall completed in $timeElapsed seconds\n"
 	writeToLog " === finished ===\n\n"