1
0
Fork 0

Update share tool to new buckets
continuous-integration/drone/push Build was killed Details

main
Ambrose Chua 2021-05-05 11:55:12 +08:00
parent 08a80a8f54
commit 0c150575e0
4 changed files with 25 additions and 12 deletions

View File

@ -47,6 +47,7 @@
!.local/share/yadm !.local/share/yadm
.local/share/yadm/repo.git .local/share/yadm/repo.git
!.local/share/yadm/archive !.local/share/yadm/archive
.mc/share
.mozilla .mozilla
.password-store .password-store
.pki .pki

1
.gitignore vendored
View File

@ -47,6 +47,7 @@
!.local/share/yadm !.local/share/yadm
.local/share/yadm/repo.git .local/share/yadm/repo.git
!.local/share/yadm/archive !.local/share/yadm/archive
.mc/share
.mozilla .mozilla
.password-store .password-store
.pki .pki

View File

@ -13,9 +13,16 @@ else
} }
fi fi
HOST_URL=https://huge.makerforce.io SHASUM="sha256sum"
HOST_ALIAS=h if [ ! -x "$(which $SHASUM)" ]; then
BUCKET=share SHASUM="shasum"
fi
HOST_ALIAS=b
BUCKET=serverwentdown
BUCKET_URL=https://serverwentdown.s3.us-west-000.backblazeb2.com
BUCKET_PUBLIC=serverwentdown-pub
BUCKET_PUBLIC_URL=https://serverwentdown-pub.s3.us-west-000.backblazeb2.com
FILES=() FILES=()
NAMES=() NAMES=()
@ -34,7 +41,7 @@ read_fileopts() {
read_fileopts read_fileopts
OPTIND=1 OPTIND=1
while getopts "hn:e:f:" opt; do while getopts "hn:e:f:p" opt; do
case "$opt" in case "$opt" in
h) h)
echo "NAME:" echo "NAME:"
@ -44,9 +51,10 @@ while getopts "hn:e:f:" opt; do
echo " share -f FILE [-n NAME] [-e EXPIRES] [-f FILE ...]" echo " share -f FILE [-n NAME] [-e EXPIRES] [-f FILE ...]"
echo "" echo ""
echo "FLAGS:" echo "FLAGS:"
echo " -f FILE Share FILE at /$BUCKET/shasum/filename" echo " -f FILE Share FILE"
echo " -n NAME Share FILE at /$BUCKET/NAME" echo " -n NAME Share at NAME instead of SHASUM/FILENAME"
echo " -e EXPIRES Set link expiry (NN[h|m|s] or 'none') (default: 168h)" echo " -e EXPIRES Link expiry (default: 168h)"
echo " -p Link never expires"
echo "" echo ""
exit 0 exit 0
;; ;;
@ -56,6 +64,9 @@ while getopts "hn:e:f:" opt; do
e) e)
EXPIRE="$OPTARG" EXPIRE="$OPTARG"
;; ;;
p)
EXPIRE="never"
;;
f) f)
read_fileopts read_fileopts
FILE="$OPTARG" FILE="$OPTARG"
@ -69,19 +80,19 @@ for i in {1..$#FILES}; do
NAME="${NAMES[$i]}" NAME="${NAMES[$i]}"
EXPIRE="${EXPIRES[$i]}" EXPIRE="${EXPIRES[$i]}"
if [ -z "$NAME" ]; then if [ -z "$NAME" ]; then
HASH=$(shasum $FILE | awk '{ print $1 }') HASH=$($SHASUM $FILE | awk '{ print $1 }')
FILENAME="$(basename $FILE)" FILENAME="$(basename $FILE)"
NAME="$HASH/$FILENAME" NAME="$HASH/$FILENAME"
fi fi
TARGET="$HOST_ALIAS/$BUCKET/$NAME" TARGET="$HOST_ALIAS/$BUCKET/$NAME"
if [[ "$EXPIRE" == "none" ]]; then if [[ "$EXPIRE" == "never" ]]; then
TARGET="$HOST_ALIAS/$BUCKET/s/$NAME" TARGET="$HOST_ALIAS/$BUCKET_PUBLIC/$NAME"
fi fi
mc cp "$FILE" "$TARGET" >&2 mc cp "$FILE" "$TARGET" >&2
if [[ "$EXPIRE" == "none" ]]; then if [[ "$EXPIRE" == "never" ]]; then
echo "$HOST_URL/$BUCKET/s/$(urlescape "$NAME")" echo "$BUCKET_PUBLIC_URL/$(urlescape "$NAME")"
else else
mc share download \ mc share download \
--expire="$EXPIRE" \ --expire="$EXPIRE" \

Binary file not shown.