Merge pull request #198 from github/revert-190-snh/working-dir

Revert "Don't change working directory when loading in ghe-backup-config"

Author: rubiojr

bin/ghe-backup

@@ -8,7 +8,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
+cd $(dirname "$0")/..
+. share/github-backup-utils/ghe-backup-config
 
 # Used to record failed backup steps
 failures=

bin/ghe-host-check

@@ -4,8 +4,9 @@
 #/ provided, the $GHE_HOSTNAME configured in backup.config is assumed.
 set -e
 
-# Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
+# Bring in the backup configuration.
+cd $(dirname "$0")/..
+. share/github-backup-utils/ghe-backup-config
 
 # Use the host provided on the command line if provided, or fallback on the
 # $GHE_HOSTNAME configured in backup.config when not present.
@@ -37,7 +38,7 @@ if [ $rc -ne 0 ]; then
     case $rc in
         255)
             if echo "$output" | grep -i "port 22: connection refused\|port 22: no route to host\|ssh_exchange_identification: Connection closed by remote host\|Connection timed out during banner exchange" >/dev/null; then
-                exec "$(basename $0)" "$hostname:122"
+                exec "bin/$(basename $0)" "$hostname:122"
             fi
 
             echo "$output" 1>&2
@@ -50,7 +51,7 @@ if [ $rc -ne 0 ]; then
             ;;
         1)
             if [ "${port:-22}" -eq 22 ] && echo "$output" | grep "use port 122" >/dev/null; then
-                exec "$(basename $0)" "$hostname:122"
+                exec "bin/$(basename $0)" "$hostname:122"
             else
                 echo "$output" 1>&2
             fi

bin/ghe-restore

@@ -21,8 +21,9 @@
 #/ <https://enterprise.github.com/help/articles/adding-an-ssh-key-for-shell-access>
 set -e
 
-# Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
+# Bring in the backup configuration.
+cd $(dirname "$0")/..
+. share/github-backup-utils/ghe-backup-config
 
 # Parse arguments
 restore_settings=false

share/github-backup-utils/ghe-backup-alambic-cluster

@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"

share/github-backup-utils/ghe-backup-config

@@ -5,20 +5,18 @@
 # This file is sourced by the various utilities under bin and share/github-backup-utils to
 # load in backup configuration and ensure things are configured properly.
 #
-# All commands in share/github-backup-utils/ should start with the following:
+# All commands should start with the following:
 #
-#     . $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
-#
-# And all commands in bin/ should start with the following:
-#
-#     . $( dirname "${BASH_SOURCE[0]}" )/../share/github-backup-utils/ghe-backup-config
+#     cd $(dirname "$0")/../..
+#     . share/github-backup-utils/ghe-backup-config
 #
 
-# Assume this script lives in share/github-backup-utils/ when setting the root
-GHE_BACKUP_ROOT="$( cd "$( dirname "${BASH_SOURCE[0]}" )/../.." && pwd )"
+# Assume the current directory is the root. This should be fine so long as all
+# scripts source us in according to the instructions above.
+GHE_BACKUP_ROOT="$(pwd)"
 
 # Get the version from the version file.
-BACKUP_UTILS_VERSION="$(cat $GHE_BACKUP_ROOT/share/github-backup-utils/version)"
+BACKUP_UTILS_VERSION="$(cat share/github-backup-utils/version)"
 
 # Add the bin and share/github-backup-utils dirs to PATH
 PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"

share/github-backup-utils/ghe-backup-es-audit-log

@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"

share/github-backup-utils/ghe-backup-es-hookshot

@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"

share/github-backup-utils/ghe-backup-es-rsync

@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root elastic backup directory based on config
 host="$GHE_HOSTNAME"

share/github-backup-utils/ghe-backup-es-tarball

@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Snapshot all Elasticsearch data or fake it when no /data/elasticsearch
 # directory exists.

share/github-backup-utils/ghe-backup-pages-cluster

@@ -7,7 +7,8 @@
 set -e
 
 # Bring in the backup configuration
-. $( dirname "${BASH_SOURCE[0]}" )/ghe-backup-config
+cd $(dirname "$0")/../..
+. share/github-backup-utils/ghe-backup-config
 
 # Set up remote host and root backup snapshot directory based on config
 host="$GHE_HOSTNAME"