Merge pull request #64 from openssh-rust/fix-script

FIx `{start, stop}_sshd.sh`: Do not mod `$XDG_RUNTIME_DIR`

Author: jonhoo

start_sshd.sh

@@ -4,9 +4,9 @@ set -euxo pipefail
 
 cd "$(dirname "$(realpath "$0")")"
 
-[ -z ${XDG_RUNTIME_DIR+x} ] && export XDG_RUNTIME_DIR=/tmp
+export RUNTIME_DIR=${XDG_RUNTIME_DIR:-/tmp}
 
-[ -f "$XDG_RUNTIME_DIR/openssh-rs/sshd_started" ] && exit
+[ -f "$RUNTIME_DIR/openssh-rs/sshd_started" ] && exit
 
 # Start the container
 export PUBLIC_KEY='ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIGzHvK2pKtSlZXP9tPYOOBb/xn0IiC9iLMS355AYUPC7'
@@ -25,12 +25,12 @@ docker run \
 export HOSTNAME=127.0.0.1
 chmod 600 .test-key
 
-mkdir -p "$XDG_RUNTIME_DIR/openssh-rs/"
+mkdir -p "$RUNTIME_DIR/openssh-rs/"
 
 echo Waiting for sshd to be up
-while ! ssh -i .test-key -v -p 2222 -l test-user $HOSTNAME -o StrictHostKeyChecking=no -o UserKnownHostsFile="$XDG_RUNTIME_DIR/openssh-rs/known_hosts" whoami; do
+while ! ssh -i .test-key -v -p 2222 -l test-user $HOSTNAME -o StrictHostKeyChecking=no -o UserKnownHostsFile="$RUNTIME_DIR/openssh-rs/known_hosts" whoami; do
     sleep 3
 done
 
 # Create sshd_started in runtime directory so that it is auto removed on restart.
-touch "$XDG_RUNTIME_DIR/openssh-rs/sshd_started"
+touch "$RUNTIME_DIR/openssh-rs/sshd_started"

stop_sshd.sh

@@ -4,9 +4,9 @@ set -euxo pipefail
 
 cd "$(dirname "$(realpath "$0")")"
 
-[ -z ${XDG_RUNTIME_DIR+x} ] && export XDG_RUNTIME_DIR=/tmp
+export RUNTIME_DIR=${XDG_RUNTIME_DIR:-/tmp}
 
-rm "$XDG_RUNTIME_DIR/openssh-rs/sshd_started"
-rm "$XDG_RUNTIME_DIR/openssh-rs/known_hosts"
+rm "$RUNTIME_DIR/openssh-rs/sshd_started"
+rm "$RUNTIME_DIR/openssh-rs/known_hosts"
 
 docker stop openssh