Option for debug.

skyformat99 · May 5, 2017 · 72882f4 · 72882f4
1 parent 3525470
commit 72882f4
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -10,8 +10,8 @@ before_install:
 
 script:
   - shellcheck -e SC2153 pre-commit sha256-update.sh update-golang.sh
-  - sudo ./update-golang.sh
-  - sudo ./update-golang.sh
+  - sudo DEBUG=1 ./update-golang.sh
+  - sudo DEBUG=1 ./update-golang.sh
   - ls -al /usr/local
-  - sudo ./update-golang.sh remove
+  - sudo DEBUG=1 ./update-golang.sh remove
   - ls -al /usr/local
diff --git a/update-golang.sh b/update-golang.sh
@@ -11,6 +11,10 @@ msg() {
     echo >&2 "$me": "$*"
 }
 
+debug() {
+    [ -n "$DEBUG" ] && msg debug: "$*"
+}
+
 log_stdin() {
     while read -r i; do
 	msg "$i"
@@ -59,6 +63,7 @@ ARCH=$arch
 PROFILED=$profiled
 CACHE=$cache
 GOPATH=$GOPATH
+DEBUG=$DEBUG
 EOF
 }
 
@@ -84,11 +89,14 @@ die() {
 
 solve() {
     local path=$1
+    local p=
     if echo "$path" | egrep -q ^/; then
-	echo "$path"
+	p="$path"
+        debug solve: "$p": `file "$p"`
     else
-	echo "$save_dir/$path"
+	p="$save_dir/$path"
     fi
+    echo "$p"
 }
 
 abs_filepath=$(solve "$filepath")
@@ -132,10 +140,15 @@ remove_old_link() {
     [ -r "$abs_goroot" ] && die could not remove existing golang directory: "$abs_goroot"
 }
 
+rm_dir() {
+    local dir=$1
+    rm -r "$dir"
+}
+
 untar() {
     if [ -d "$abs_new_install" ]; then
-        msg untar: rm -r "$abs_new_install"
-        rm -r "$abs_new_install" || die untar: could not remove: "$abs_new_install"
+        msg untar: rm_dir "$abs_new_install"
+        rm_dir "$abs_new_install" || die untar: could not remove: "$abs_new_install"
     fi
     [ -d "$PWD" ] || die untar: not a directory: "$PWD"
     [ -w "$PWD" ] || die untar: unable to write: "$PWD"
@@ -231,7 +244,7 @@ remove_golang() {
         msg remove: removing symlink: "$abs_goroot"
         rm "$abs_goroot"
         msg remove: removing dir: "$old_install"
-        rm -r "$old_install"
+        rm_dir "$old_install"
     else
         msg remove: not found symlink for old install
     fi
@@ -244,7 +257,7 @@ remove_old_install() {
 	if [ "$abs_old_install" != "$abs_new_install" ]; then
             # remove old install only if it actually changed
             msg removing old install: "$abs_old_install"
-            rm -r "$abs_old_install"
+            rm_dir "$abs_old_install"
 	fi
     fi
 }

diff --git a/update-golang.sh.sha256 b/update-golang.sh.sha256
@@ -1 +1 @@
-d92994f82de766ce6f5fd4d9d0d5cb8862ef538969c786729c01c482d3ff40a6  update-golang.sh
+e19e63ac69f9ad78f25c4ff9164d54d8f3a31d64d9bde643ec0dbe176dfbe5a5  update-golang.sh
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d92994f82de766ce6f5fd4d9d0d5cb8862ef538969c786729c01c482d3ff40a6 update-golang.sh
		e19e63ac69f9ad78f25c4ff9164d54d8f3a31d64d9bde643ec0dbe176dfbe5a5 update-golang.sh