From 785c0245f0a994ac2f01a08c0a9f1de733b21f06 Mon Sep 17 00:00:00 2001 From: Janek Bevendorff Date: Wed, 14 Oct 2015 20:35:55 +0200 Subject: [PATCH] Simplify code --- server/usr/bin/rs-run-ssh-cmd | 20 +++++++++----------- 1 file changed, 9 insertions(+), 11 deletions(-) diff --git a/server/usr/bin/rs-run-ssh-cmd b/server/usr/bin/rs-run-ssh-cmd index 8e9c2d1..9e0e0d0 100755 --- a/server/usr/bin/rs-run-ssh-cmd +++ b/server/usr/bin/rs-run-ssh-cmd @@ -1,6 +1,6 @@ #!/bin/sh ## -# Copyright (C) 2013-2014 Janek Bevendorff +# Copyright (C) 2013-2015 Janek Bevendorff # Website: http://www.refining-linux.org/ # # Run a restricted command in an SSH session. @@ -27,19 +27,17 @@ ## home_dir=$1 +export HOME="${home_dir}/files" +cd $HOME if $(echo "${SSH_ORIGINAL_COMMAND}" | grep -q "^\(internal-sftp\|.*/sftp-server\)"); then - export HOME="${home_dir}/files" - cd $HOME - [ -x /usr/lib/ssh/sftp-server ] && exec /usr/lib/ssh/sftp-server -R - [ -x /usr/libexec/sftp-server ] && exec /usr/libexec/sftp-server -R - [ -x /opt/libexec/sftp-server ] && exec /opt/libexec/sftp-server -R + [ -x /usr/lib/ssh/sftp-server ] && exec /usr/lib/ssh/sftp-server -R + [ -x /usr/libexec/sftp-server ] && exec /usr/libexec/sftp-server -R + [ -x /opt/libexec/sftp-server ] && exec /opt/libexec/sftp-server -R else - RSYNC=/usr/bin/rsync - RSYNC_OPTS="--server --daemon --config='$home_dir/rsync.conf' ." - [ -x $RSYNC ] && exec $RSYNC $(eval echo $RSYNC_OPTS) - RSYNC=/opt/bin/rsync - [ -x $RSYNC ] && exec $RSYNC $(eval echo $RSYNC_OPTS) + RSYNC_OPTS="--server --daemon --config='$home_dir/rsync.conf' ." + [ -x /usr/bin/rsync ] && exec /usr/bin/rsync $(eval echo $RSYNC_OPTS) + [ -x /opt/bin/rsync ] && exec /opt/bin/rsync $(eval echo $RSYNC_OPTS) fi echo "Session failed." >&2