Skip to content

Commit ca7e1a3

Browse files
committed
Rename libexec to share/github-backup-utils
sed -i '' -e 's/libexec/share\/github-backup-utils/g' $(git ls-files) mkdir -p share/github-backup-utils git mv libexec/* share/github-backup-utils sed -i '' -e 's|)/\.\.|)/\.\./\.\.|g' $(git ls-files share)
1 parent 6148372 commit ca7e1a3

33 files changed

+64
-64
lines changed

bin/ghe-backup

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ set -e
99

1010
# Bring in the backup configuration
1111
cd $(dirname "$0")/..
12-
. libexec/ghe-backup-config
12+
. share/github-backup-utils/ghe-backup-config
1313

1414
# Host we're backing up
1515
host="$GHE_HOSTNAME"

bin/ghe-host-check

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ set -e
66

77
# Bring in the backup configuration.
88
cd $(dirname "$0")/..
9-
. libexec/ghe-backup-config
9+
. share/github-backup-utils/ghe-backup-config
1010

1111
# Use the host provided on the command line if provided, or fallback on the
1212
# $GHE_HOSTNAME configured in backup.config when not present.

bin/ghe-restore

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ set -e
2323

2424
# Bring in the backup configuration.
2525
cd $(dirname "$0")/..
26-
. libexec/ghe-backup-config
26+
. share/github-backup-utils/ghe-backup-config
2727

2828
# The snapshot directory we're restoring from. This is the 'current' snapshot
2929
# by default but may be overridden with the -s flag. Additional restore scripts

libexec/ghe-backup-config renamed to share/github-backup-utils/ghe-backup-config

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,21 +2,21 @@
22
# Usage: . ghe-backup-config
33
# GitHub Enterprise backup shell configuration.
44
#
5-
# This file is sourced by the various utilities under bin and libexec to
5+
# This file is sourced by the various utilities under bin and share/github-backup-utils to
66
# load in backup configuration and ensure things are configured properly.
77
#
88
# All commands should start with the following:
99
#
10-
# cd $(dirname "$0")/..
11-
# . libexec/ghe-backup-config
10+
# cd $(dirname "$0")/../..
11+
# . share/github-backup-utils/ghe-backup-config
1212
#
1313

1414
# Assume the current directory is the root. This should be fine so long as all
1515
# scripts source us in according to the instructions above.
1616
GHE_BACKUP_ROOT="$(pwd)"
1717

18-
# Add the bin and libexec dirs to PATH
19-
PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/libexec:$PATH"
18+
# Add the bin and share/github-backup-utils dirs to PATH
19+
PATH="$GHE_BACKUP_ROOT/bin:$GHE_BACKUP_ROOT/share/github-backup-utils:$PATH"
2020

2121
# The backup config file. This may be set in the environment.
2222
: ${GHE_BACKUP_CONFIG:="$GHE_BACKUP_ROOT/backup.config"}
@@ -97,7 +97,7 @@ GHE_SNAPSHOT_DIR="$GHE_DATA_DIR"/"$GHE_SNAPSHOT_TIMESTAMP"
9797
: ${GHE_IONICE:="ionice -c 3"}
9898

9999
# The number of seconds to wait for in progress git-gc processes to complete
100-
# before starting the sync of git data. See libexec/ghe-backup-repositories-rsync
100+
# before starting the sync of git data. See share/github-backup-utils/ghe-backup-repositories-rsync
101101
# for more information. Default: 10 minutes.
102102
: ${GHE_GIT_COOLDOWN_PERIOD:=600}
103103

@@ -148,7 +148,7 @@ fi
148148

149149
# Run ghe-host-check and establish the version of the remote GitHub instance in
150150
# the exported GHE_REMOTE_VERSION variable. If the remote version has already
151-
# been established then don't perform the host check again. Utilities in libexec
151+
# been established then don't perform the host check again. Utilities in share/github-backup-utils
152152
# that need the remote version should use this function instead of calling
153153
# ghe-host-check directly to reduce ssh roundtrips. The top-level ghe-backup and
154154
# ghe-restore commands establish the version for all subcommands.

libexec/ghe-backup-es-rsync renamed to share/github-backup-utils/ghe-backup-es-rsync

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
set -e
88

99
# Bring in the backup configuration
10-
cd $(dirname "$0")/..
11-
. libexec/ghe-backup-config
10+
cd $(dirname "$0")/../..
11+
. share/github-backup-utils/ghe-backup-config
1212

1313
# Perform a host-check and establish GHE_REMOTE_XXX variables.
1414
ghe_remote_version_required "$GHE_HOSTNAME"

libexec/ghe-backup-es-tarball renamed to share/github-backup-utils/ghe-backup-es-tarball

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
set -e
88

99
# Bring in the backup configuration
10-
cd $(dirname "$0")/..
11-
. libexec/ghe-backup-config
10+
cd $(dirname "$0")/../..
11+
. share/github-backup-utils/ghe-backup-config
1212

1313
# Snapshot all Elasticsearch data or fake it when no /data/elasticsearch
1414
# directory exists.

libexec/ghe-backup-es-v0.9-rsync renamed to share/github-backup-utils/ghe-backup-es-v0.9-rsync

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
set -e
99

1010
# Bring in the backup configuration
11-
cd $(dirname "$0")/..
12-
. libexec/ghe-backup-config
11+
cd $(dirname "$0")/../..
12+
. share/github-backup-utils/ghe-backup-config
1313

1414
# Set up remote host and root elastic backup directory based on config
1515
host="$GHE_HOSTNAME"

libexec/ghe-backup-es-v1.x-rsync renamed to share/github-backup-utils/ghe-backup-es-v1.x-rsync

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@
88
set -e
99

1010
# Bring in the backup configuration
11-
cd $(dirname "$0")/..
12-
. libexec/ghe-backup-config
11+
cd $(dirname "$0")/../..
12+
. share/github-backup-utils/ghe-backup-config
1313

1414
# Set up remote host and root elastic backup directory based on config
1515
host="$GHE_HOSTNAME"

libexec/ghe-backup-pages-rsync renamed to share/github-backup-utils/ghe-backup-pages-rsync

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
set -e
88

99
# Bring in the backup configuration
10-
cd $(dirname "$0")/..
11-
. libexec/ghe-backup-config
10+
cd $(dirname "$0")/../..
11+
. share/github-backup-utils/ghe-backup-config
1212

1313
# Use the common user data rsync backup utility.
1414
ghe-backup-userdata pages

libexec/ghe-backup-pages-tarball renamed to share/github-backup-utils/ghe-backup-pages-tarball

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,8 @@
77
set -e
88

99
# Bring in the backup configuration
10-
cd $(dirname "$0")/..
11-
. libexec/ghe-backup-config
10+
cd $(dirname "$0")/../..
11+
. share/github-backup-utils/ghe-backup-config
1212

1313
# Snapshot all Pages data or fake it when no /data/pages directory exists.
1414
echo '

0 commit comments

Comments
 (0)