From 0c150575e063ab6981a50e234e5bc01e5822bf3b Mon Sep 17 00:00:00 2001
From: Ambrose Chua <ambrose@hey.com>
Date: Wed, 5 May 2021 11:55:12 +0800
Subject: [PATCH] Update share tool to new buckets

---
 .dockerignore             |   1 +
 .gitignore                |   1 +
 .local/bin/share          |  35 +++++++++++++++++++++++------------
 .local/share/yadm/archive | Bin 884 -> 886 bytes
 4 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/.dockerignore b/.dockerignore
index 7413463..de3058d 100644
--- a/.dockerignore
+++ b/.dockerignore
@@ -47,6 +47,7 @@
 !.local/share/yadm
 .local/share/yadm/repo.git
 !.local/share/yadm/archive
+.mc/share
 .mozilla
 .password-store
 .pki
diff --git a/.gitignore b/.gitignore
index a380212..ae087c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -47,6 +47,7 @@
 !.local/share/yadm
 .local/share/yadm/repo.git
 !.local/share/yadm/archive
+.mc/share
 .mozilla
 .password-store
 .pki
diff --git a/.local/bin/share b/.local/bin/share
index 308c767..3fb87c5 100755
--- a/.local/bin/share
+++ b/.local/bin/share
@@ -13,9 +13,16 @@ else
 	}
 fi
 
-HOST_URL=https://huge.makerforce.io
-HOST_ALIAS=h
-BUCKET=share
+SHASUM="sha256sum"
+if [ ! -x "$(which $SHASUM)" ]; then
+	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=()
 NAMES=()
@@ -34,7 +41,7 @@ read_fileopts() {
 read_fileopts
 
 OPTIND=1
-while getopts "hn:e:f:" opt; do
+while getopts "hn:e:f:p" opt; do
 	case "$opt" in
 	h)
 		echo "NAME:"
@@ -44,9 +51,10 @@ while getopts "hn:e:f:" opt; do
 		echo "   share -f FILE [-n NAME] [-e EXPIRES] [-f FILE ...]"
 		echo ""
 		echo "FLAGS:"
-		echo "  -f FILE     Share FILE at /$BUCKET/shasum/filename"
-		echo "  -n NAME     Share FILE at /$BUCKET/NAME"
-		echo "  -e EXPIRES  Set link expiry (NN[h|m|s] or 'none') (default: 168h)"
+		echo "  -f FILE     Share FILE"
+		echo "  -n NAME     Share at NAME instead of SHASUM/FILENAME"
+		echo "  -e EXPIRES  Link expiry (default: 168h)"
+		echo "  -p          Link never expires"
 		echo ""
 		exit 0
 		;;
@@ -56,6 +64,9 @@ while getopts "hn:e:f:" opt; do
 	e)
 		EXPIRE="$OPTARG"
 		;;
+	p)
+		EXPIRE="never"
+		;;
 	f)
 		read_fileopts
 		FILE="$OPTARG"
@@ -69,19 +80,19 @@ for i in {1..$#FILES}; do
 	NAME="${NAMES[$i]}"
 	EXPIRE="${EXPIRES[$i]}"
 	if [ -z "$NAME" ]; then
-		HASH=$(shasum $FILE | awk '{ print $1 }')
+		HASH=$($SHASUM $FILE | awk '{ print $1 }')
 		FILENAME="$(basename $FILE)"
 		NAME="$HASH/$FILENAME"
 	fi
 
 	TARGET="$HOST_ALIAS/$BUCKET/$NAME"
-	if [[ "$EXPIRE" == "none" ]]; then
-		TARGET="$HOST_ALIAS/$BUCKET/s/$NAME"
+	if [[ "$EXPIRE" == "never" ]]; then
+		TARGET="$HOST_ALIAS/$BUCKET_PUBLIC/$NAME"
 	fi
 
 	mc cp "$FILE" "$TARGET" >&2
-	if [[ "$EXPIRE" == "none" ]]; then
-		echo "$HOST_URL/$BUCKET/s/$(urlescape "$NAME")"
+	if [[ "$EXPIRE" == "never" ]]; then
+		echo "$BUCKET_PUBLIC_URL/$(urlescape "$NAME")"
 	else
 		mc share download \
 			--expire="$EXPIRE" \
diff --git a/.local/share/yadm/archive b/.local/share/yadm/archive
index 48298cd91575da5f7598e7cdb740c293329aa0f4..ee1cc45df27426e7835673cd59dc4e1177c4767d 100644
GIT binary patch
literal 886
zcmV-+1Bv{F0t^Gl{+uknUsYfM5CDNb<y<j3HKQQ!X(7p48VF*33hv_JhA_<wST{{s
z0mLqV0tpAlw}EGEXlr*3O6Ps^64ya5sj7hR*E&_|YX3SqpVqZ*YWf&pFn;$;?NOc=
zT;)&<!{(UCqut8~eZDh^#-O7<a-S$|#(S|T?KZMoOdhuKE)7H!3Q9EX6e8o$3?P{@
zP50MvV_QCHcJ=Qi!>2%!{UW$nBtH}Myp7KqK?fFgxGYj6Da&hAQ98i#M<os(s%Z`0
za-Np@N@$|P#_*Gg=HVbQ^VDy(kwBxsrN@HjSyB>@eXBHJ7-yv?z9^it5v{&Kk_}8A
zW2i`i@_-{*X_K{5L)-}(^^G${otqK2O^PfD%pshU%c@%LBI;4$**6Q2mWfa<8wo>C
zQty7Sq$81`D!&`ekc^kYZ}Y=x7q+PK{5Fq#m~_AOK2@xX5)I+<@=i3rjexDUaa~yR
zgUIid##|xfHu6?k*EB1*)hN>fOdg9#)^Po1{sqdp`WN>Sa~nkhD0y&ySf)Gmr<r|<
zM^S<dc8)Qy8F#`Q>%4;v_E_8nIVhT|k8d57k8mC6;&zV3p}JrlgBU6<@rC+N2Y-n4
zUVT>(H=Qkl>1H%nlAPBFjzQ{?ydAdZh40iY*NyrLPvIiA*d1l8RTn)NIFVv9I*d8c
z+|TiPy(SR&o5GeoVSCcRqyZ5Z4UXNVFd@1jz4nS{h?%&^#I$-&>Be04O+@TCQiDbr
zHLD;bsdDYg@B7s1AwUEw0xPEny2$4J>R;u7ff53NhmX`o+eUo~u&|1K?S2i^oGQ7@
zm<1Q9`4<TKP?KIHn;}`mAVzv&%pY5KT<==(S4Q}rxm@rKFAI?vrorY7hs26WDgHs7
zyfG5u;VS`CVh8hEu$H7WeoW4bIJ~71;W1R?N9zyBYd~I<d|eLeJ~jHHW!MS!zd?TM
zo#KW!vhJ~JRzhM&*g88Onc|>NH1e`{WwG?Z?An#^3&M^%P48oe+OaEUF~zMH1FFxr
zIQ$A&h*rRVMRd)4FIHDK?5ezl>5y^)0t>x$6~dc9c?FeHrr7Q-ZPK64gEvHPfJ2k(
zixf0BJyFF3naJ|`#^O=WyyaTF_Iku4(garB0Xsa#J1X1ztmxuQ?ZF7TX(1E@_qY&|
MF2#2yU(v6*pi0TF{Qv*}

literal 884
zcmV-)1B?8H0t^Gl{+uknUsYfM5B@5+oxZGo&4sT>KtRZ`8i+dJiT1Q7#Sox`XbX5v
z>M|*cJh-nsZC61CC_y7o>a`#wD$_yr_LeI*b4*(F5N+LE1|%@%!gpY0<5G#Pz~Qxm
zf&K5th-KdljYggmQ##nk5o#L3`m6z7-Ms31z;1V3jF0)}_6H2bK+NW*f7SF{CgoU=
z^zZCh{%{9Yz|Z9$`K%8#7C=+7(`8t`-Sz}2m9Fb{4ZCDt(c>I=P9%EQ=V8S|$6Wg9
z)t=!jaKD>#wK%+3j<`>P;Y7_DipLviP#EvPW~Yxsn-~K&bA|VPEvIF&OE5@kLC%7o
z$p-??Xp<z@7>ip^Trzj`Zu+Bt4sbQ^#sc=xC;hwXdh4j`Rgp0TaFP{LO&)8wxTp-+
zv}Y%)67&V`@H0_gINAaw4IABOOSjB}sLoO0(b=%nPl0SAc^?dpEBF6~`D(z@HMqEq
zXz1~!LH$p=@X>Hp^KjzDv=cvIJ~a7WfEqAYlxmX|enWk13GGDkw-_AAoONS|ajC|z
zV^jM@-Q(LkZPA&p)i9kLrA$RXy5GiE9*R<4OrP|w=@w0q{ZiI>5MkuT(l{nA5C~Fc
zT$G!oA0dG5_H|bpyc(ksf9P6z>64(f5s0LG2;{CArq<RL;t)e5`Lv1HX{r1n<hW@H
zPSj+jy0RL|3>UsxnXuBpq5(yUmtlsas>3f((0)5TXU7fmS`Yq{<SzLyEh4TUxUtQm
z!ne|W6{pws4B;js7nD^REN7a5Bb8F_;bLpY7*1A#P9xc_<aU0{_;2lW!95jzLoyhI
zR~%T90}j#Rt7}B1>Y{^ez^XAzG2WHRGz8<+ggJ276z`O#OxE78YCrdjel!M*?-g9~
zqTeE*=(<B2c#GdbflMnea5B-n`B)`a9e}l;HJS*pxY9`VRpak71|$UTt}dJ4vMHV|
zDZ(J((7Dm*?d*QW{uyK@^T5UTs>8D7`bu>hB-`Tk32|DUxIOGs0ej3X8JTxe;?7o_
zL9VSGP&`vDfXu5mBIk2Gm~<B%9(U{jK4qgRf8CStR_r7+i)XEcP<J0gMuEX0n#Z3r
z-)a}BhM<5<sFN*I`@(%3!!f8BxS}##R@8nicXjQDq`e_1u`x`x_J><ccI){SVDdT`
K(7j9(iVNVvV7#RO