bugfix(misc): fix kind, gprox, myip, pandoc

[webi-installers/.git] / gprox / install.sh

diff --git a/gprox/install.sh b/gprox/install.sh
index ab63c8025f7cfdc188dd6b4b5f72426074c9a142..196c2405766b9fcf658d392f6b2dac9c53240272 100644 (file)
--- a/gprox/install.sh
+++ b/gprox/install.sh
@@ -1,8 +1,8 @@
 #!/bin/bash
+set -e
+set -u
 
-{
-    set -e
-    set -u
+function __init_gprox() {
 
     ##################
     # Install gprox #
@@ -18,14 +18,7 @@
     pkg_src_dir="$HOME/.local/opt/gprox-v$WEBI_VERSION"
     pkg_src="$pkg_src_cmd"
 
-    # pkg_install must be defined by every package
-    pkg_install() {
-        # ~/.local/opt/gprox-v0.99.9/bin
-        mkdir -p "$(dirname $pkg_src_cmd)"
-
-        # mv ./gprox-*/gprox ~/.local/opt/gprox-v0.99.9/bin/gprox
-        mv ./gprox-*/gprox "$pkg_src_cmd"
-    }
+    WEBI_SINGLE=true
 
     # pkg_get_current_version is recommended, but (soon) not required
     pkg_get_current_version() {
@@ -33,7 +26,10 @@
         #       gprox 0.99.9 (rev abcdef0123)
         # This trims it down to just the version number:
         #       0.99.9
-        echo $(gprox --version 2>/dev/null | head -n 1 | cut -d ' ' -f 2)
+        gprox --version 2> /dev/null |
+            head -n 1 |
+            cut -d ' ' -f 2
     }
-
 }
+
+__init_gprox