diff options
| author | teor <teor@torproject.org> | 2019-11-06 16:14:06 +1000 |
|---|---|---|
| committer | teor <teor@torproject.org> | 2019-11-06 16:14:06 +1000 |
| commit | f7b45975bf4d660d596542f5efd62fd152144199 (patch) | |
| tree | 52772fb7100e50413b72bdb3a7a240d5cb234085 /scripts/git/git-merge-forward.sh | |
| parent | 9ca25f3a68374ca4787b4eaa8bf4fb3365061d26 (diff) | |
| parent | 7f23d47f723edeea206d5438af3d109dbb4ac835 (diff) | |
| download | tor-f7b45975bf4d660d596542f5efd62fd152144199.tar.gz tor-f7b45975bf4d660d596542f5efd62fd152144199.zip | |
Merge branch 'bug32402_042' into bug32402_master
Merge changes from master with shellcheck fixes.
Diffstat (limited to 'scripts/git/git-merge-forward.sh')
| -rwxr-xr-x | scripts/git/git-merge-forward.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/git/git-merge-forward.sh b/scripts/git/git-merge-forward.sh index 339573b39c..a6df479590 100755 --- a/scripts/git/git-merge-forward.sh +++ b/scripts/git/git-merge-forward.sh @@ -1,6 +1,6 @@ #!/usr/bin/env bash -SCRIPT_NAME=`basename $0` +SCRIPT_NAME=$(basename "$0") function usage() { |