blackbox_shred_all_files now changes to root dir before running. Moved similar code from blackbox_postdeploy into _blackbox_common.sh as change_to_root function.

bin/_blackbox_common.sh

@@ -390,3 +390,17 @@ function vcs_remove_git() {
 function vcs_remove_svn() {
   svn delete """$@"""
 }
+
+function change_to_root() {
+    # If BASEDIR is not set, use REPOBASE.
+    if [[ "$BASEDIR" = "" ]]; then
+      BASEDIR="$REPOBASE"
+    fi
+
+    if [[ "$BASEDIR" = "/dev/null" ]]; then
+      echo 'WARNING: Not in a VCS repo.  Not changing directory.'
+    else
+      echo "CDing to $BASEDIR"
+      cd "$BASEDIR"
+    fi
+}

bin/blackbox_postdeploy

@@ -22,18 +22,7 @@ else
   FILE_GROUP="$1"
 fi
 
-# If BASEDIR is not set, use REPOBASE.
-if [[ "$BASEDIR" = "" ]]; then
-  BASEDIR="$REPOBASE"
-fi
-
-if [[ "$BASEDIR" = "/dev/null" ]]; then
-  echo 'WARNING: Not in a VCS repo.  Not changing directory.'
-else
-  echo "CDing to $BASEDIR"
-  cd "$BASEDIR"
-fi
-
+change_to_root
 prepare_keychain
 
 # Decrypt:

bin/blackbox_shred_all_files

@@ -18,6 +18,8 @@
 set -e
 . _blackbox_common.sh
 
+change_to_root
+
 echo '========== FILES BEING SHREDDED:'
 for i in $(<$BB_FILES) ; do
   unencrypted_file=$(get_unencrypted_filename "$i")