Merge branch 'master' into bevns/ghe-detect-leaked-ssh-keys

Author: rubiojr

share/github-backup-utils/ghe-detect-leaked-ssh-keys

@@ -40,7 +40,7 @@ if [ -n "$ppid_script" ]; then
 fi
 
 sshkeygen_multiple_hash_formats=false
-if (ssh-keygen --a-dedicated-help-flag-would-be-great 2>&1 | grep 'ssh-keygen -l ' | grep -q -- '-E'); then
+if (ssh-keygen -E 2>&1 | head -1 |  grep -q 'option requires an argument'); then
   sshkeygen_multiple_hash_formats=true
 fi
 

test/test-ghe-backup-config.sh

@@ -19,13 +19,13 @@ begin_test "ghe-backup-config GHE_CREATE_DATA_DIR disabled"
 (
     set -e
 
-    export GHE_DATA_DIR=$(mktemp -d -u)
+    export GHE_DATA_DIR="$TRASHDIR/create-enabled-data"
     . share/github-backup-utils/ghe-backup-config 2>&1 \
       | grep -q "Creating the backup data directory ..."
     test -d $GHE_DATA_DIR
     rm -rf $GHE_DATA_DIR
 
-    export GHE_DATA_DIR=$(mktemp -d -u)
+    export GHE_DATA_DIR="$TRASHDIR/create-disabled-data"
     export GHE_CREATE_DATA_DIR=no
     set +e
     error=$(. share/github-backup-utils/ghe-backup-config 2>&1)

test/testlib.sh

@@ -65,7 +65,8 @@ atexit () {
 
     # cleanup injected test key
     shared_path=$(dirname $(which ghe-detect-leaked-ssh-keys))
-    sed -i '/98:d8:99:d3:be:c0:55:05:db:b0:53:2f:1f:ad:b3:60/d' "$shared_path/ghe-ssh-leaked-host-keys-list.txt"
+    sed -i.bak '/98:d8:99:d3:be:c0:55:05:db:b0:53:2f:1f:ad:b3:60/d' "$shared_path/ghe-ssh-leaked-host-keys-list.txt"
+    rm -f "$shared_path/ghe-ssh-leaked-host-keys-list.txt.bak"
 
     [ -z "$KEEPTRASH" ] && rm -rf "$TRASHDIR"
     if [ $failures -gt 0 ]