bin/up: switch to the new fshare-based up service

Use the same script for up and ups.

3 files changed, 6 insertions, 12 deletions

diff --git a/bin/up b/bin/up
deleted file mode 100755
index 7d68980..0000000
--- a/bin/up
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-# up.khirnov.net 0x0 instance
-if [ "$1" ]; then
-    fpath=$1
-else
-    fpath="-"
-fi
-
-url=$(curl -sS -E ~/.local/var/up/cert -F "file=@${fpath}" "https://up.khirnov.net/")
-[ "${url}" ] && echo "${url}"
diff --git a/bin/ups b/bin/ups
index d38a076..6ca206f 100755
--- a/bin/ups
+++ b/bin/ups
@@ -16,7 +16,9 @@ try:
 except ImportError:
     have_magic = False
 
-server    = 'https://ups.khirnov.net/'
+progname = os.path.basename(sys.argv[0])
+service  = 'up' if progname == 'up' else 'ups'
+server    = 'https://%s.khirnov.net/' % service
 cert_path = os.path.expanduser('~/.local/var/up/cert')
 
 parser = argparse.ArgumentParser()
diff --git a/install.conf.yaml b/install.conf.yaml
index 5eacb0d..756c5e6 100644
--- a/install.conf.yaml
+++ b/install.conf.yaml
@@ -16,7 +16,9 @@
 
 - link:
     ~/.local/bin/diff-highlight: bin/diff-highlight
-    ~/.local/bin/up:       bin/up
+    ~/.local/bin/up:
+      relink: True
+      path:                bin/ups
     ~/.local/bin/ups:      bin/ups
     ~/.config/bash/prompt: bash/prompt
     ~/.bashrc:             bash/bashrc