From 823d97002f1a8df8fefc803b4b252c8b4a4baa47 Mon Sep 17 00:00:00 2001 From: Albert S Date: Sun, 21 Mar 2021 22:13:42 +0100 Subject: [PATCH] client/upload: Offer copying link to keyboard --- client/upload | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-) diff --git a/client/upload b/client/upload index e48a874..842eb0c 100755 --- a/client/upload +++ b/client/upload @@ -28,10 +28,10 @@ fi ssh $UPLOADER_SSH_SERVER mkdir $UPLOADER_UPLOAD_DIR/$random BASENAME=$( basename "$1" ) - +LINK="" if [ $PLAIN -eq 1 ] ; then scp -r "$1" $UPLOADER_SSH_SERVER:$UPLOADER_UPLOAD_DIR/$random/$BASENAME - echo "$UPLOADER_URL_PREFIX/$random/$BASENAME" + LINK="$UPLOADER_URL_PREFIX/$random/$BASENAME" else KEYBASE=$(openssl rand -base64 32) KEYASHEX=$(echo -n $KEYBASE | base64 -d | xxd -p -c 10000) # linebreak after 10000 chars. i.e. never @@ -50,9 +50,16 @@ else fi $PIPER | openssl enc -aes-256-cbc -K "$KEYASHEX" -iv $(printf '0%.0s' {1..32}) | # print '0' 32 times = 16 bytes as hex - ssh $UPLOADER_SSH_SERVER "cat > $UPLOADER_UPLOAD_DIR/$random/$FSNAME" - echo "$UPLOADER_URL_PREFIX#$random/$FSNAME:$KEYBASE:$MIMETYPE:$UPLOADED_NAME" + ssh $UPLOADER_SSH_SERVER "cat > $UPLOADER_UPLOAD_DIR/$random/$FSNAME" + LINK="$UPLOADER_URL_PREFIX#$random/$FSNAME:$KEYBASE:$MIMETYPE:$UPLOADED_NAME" fi +echo "$LINK" +echo "" +echo "Press any key to copy the link to your clipboard" 1>&2 +read -n 1 -t 5 ANSWER +if [ -n "$ANSWER" ] ; then + echo "$LINK" | xclip -selection clipboard +fi ssh $UPLOADER_SSH_SERVER chown -R $UPLOADER_FILE_OWNER $UPLOADER_UPLOAD_DIR/$random/ ssh $UPLOADER_SSH_SERVER "echo $when:$random >> $UPLOADER_EXPIRATION_FILE"