From 61d30642d9b23de07231cb7a340d5ba55939e2c5 Mon Sep 17 00:00:00 2001 From: Your Name <j@842.be> Date: Thu, 29 May 2025 23:33:58 +1200 Subject: [PATCH] :-'Generic Commit' --- sos/sos | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/sos/sos b/sos/sos index 1fee1c6..bbc977b 100755 --- a/sos/sos +++ b/sos/sos @@ -54,15 +54,13 @@ function upload() { TARGET_URL="https://$server/upload" echo "Uploading $file to $TARGET_URL" -read -r -d '' METADATA_JSON <<EOF +METADATA_JSON=$(cat <<EOF { "labeltags": ["$label"], "description": "Uploaded by sos" } EOF - - echo "Metadata:" - echo "$METADATA_JSON | jq" +) TOKENPATH="$HOME/.config/sos/write_token.txt" if [ ! -f "$TOKENPATH" ]; then @@ -72,23 +70,24 @@ EOF HASH="" - UPLOAD_RESPONSE=$(curl -X PUT \ + UPLOAD_RESPONSE=$(curl -s -X PUT \ -H "Authorization: Bearer ${WRITE_TOKEN}" \ -F "file=@${file}" \ -F "metadata=${METADATA_JSON}" \ "$TARGET_URL" \ ) || die "Failed to upload $file to $TARGET_URL" - echo "Repsonse:" - echo "$UPLOAD_RESPONSE" - HASH=$(echo "$UPLOAD_RESPONSE" | jq -r '.hash') JSON2=$(eval "curl -s \"https://$server/meta/$HASH\"") || die "Failed to get meta for $HASH" - FILENAME=$(echo "$JSON2" | jq -r '.filename') + FILENAME=$(echo "$JSON2" | jq -r '.metadata.filename') + + echo "Metadata:" + echo "$JSON2" | jq + + echo " " echo "Download URL: https://$server/$label > $FILENAME" echo "Alternative: https://$server/$HASH > $FILENAME" - echo "Hash: $HASH" } # if no arguments, show help