Make CLI uploader zsh-compatible, fixes #11

lgommans · Jun 28, 2023 · 05b7ab7 · 05b7ab7
1 parent 21e3c8f
commit 05b7ab7
Show file tree

Hide file tree

Showing 2 changed files with 62 additions and 3 deletions.
diff --git a/web/frontpage.htm b/web/frontpage.htm
@@ -1,7 +1,10 @@
 <!--
-function dropm { result=$(curl -sS --user-agent cli --form "f=@$1" "https://dro.pm/fileman.php?secret=$2"); if [ "$result" == "1" ]; then echo Updated; return; fi; echo "$result"; }
-You can easily import this using: """source <(curl https://dro.pm | head -2 | tail -1)""" (without quotes). See https://pastebin.com/HUK0beKa for more information.
-Add it to .bashrc (or your favorite shell's equivalent) to make the function permanently available.
+function dropm { result=$(curl -sS --user-agent cli --form "f=@$1" "https://dro.pm/fileman.php?secret=$2"); if [ "$result" = "1" ]; then echo Updated; return; fi; echo "$result"; }
+
+Import this by using:
+  source <(curl https://dro.pm | head -2 | tail -1)
+
+See https://dro.pm/shell.txt for more information.
 -->
 
 <!DOCTYPE html>
@@ -32,6 +35,7 @@
 				<br>
 				<span id=chooseyourlink>1. Choose your link</span><br>
 				<input maxlength=250 id=customLink> <span id=customLinkValidation></span>
+				<!-- TODO shuffle button using cryptographic random -->
 				<br><br>
 				<label><input type=checkbox id=expireAfterFirstDownload> Delete immediately upon opening</label>
 				<br><br>

diff --git a/web/shell.txt b/web/shell.txt
@@ -0,0 +1,55 @@
+Dro.pm uploader - Version 1.2 - check https://dro.pm/shell.txt for new versions.
+
+---
+
+Put this in your .bashrc, or the rc file of your favorite shell:
+
+  function dropm {
+    result=$(curl --silent --user-agent cli --form "f=@$1" "https://dro.pm/fileman.php?secret=$2");
+    if [ "$result" = "1" ]; then
+        echo Updated;
+        return;
+    fi;
+    echo "$result" | awk '{print $2}' | tr -d \\n | xsel -b;
+    echo "$result";
+  }
+
+Then use it like this:
+
+  $ dropm my_file.zip
+
+It will give you a code and a short link as result. The short link will automatically be copied to your clipboard if you have xsel installed. Example output:
+
+  5cae34e31c52bd5fee451cc347646a74314a9315 dro.pm/d
+
+The code you can use to change the URL like this:
+
+  $ dropm another_file.bmp 5cae34e31c52bd5fee451cc347646a74314a9315
+
+---
+
+If you want to use the function temporarily, without installation, you can easily grab the code from the website itself:
+
+  $ curl https://dro.pm | head
+
+The second line of the HTML source code contains the Bash function (same as above) which you can copy and just paste in your terminal.
+If you don't have a mouse to select and copy the text, use this slightly more complicated command:
+
+  $ source <(curl https://dro.pm | head -2 | tail -1)
+
+You can check that it was successful by using `type dropm`, which will show the code that you just "sourced" (imported).
+
+---
+
+Submitting links or plain text is currently not supported from the command line, only file uploads. Do you want to have this feature? Please let me know! https://github.com/lgommans/dro.pm/issues
+
+---
+
+Notes:
+
+- In short, uploading works like this: curl -sA cli -F f=@my_file.zip https://dro.pm/fileman.php
+
+- If you don't want the automatic clipboard copying, remove the 'echo "$result | ... | xsel -b;' line.
+
+- Upload progress can be shown by removing --silent.
+