X-Git-Url: https://git.josue.xyz/?a=blobdiff_plain;f=caddy%2Finstall.sh;h=f59c42a1fb410d03000f305a8de9cca0de1d7b17;hb=d68d0376b9cead7e1bf6446e71f00c8e3c965a45;hp=d46c52f7826465a56c80d8573d84834cf4cdbe73;hpb=6ba463d284b063c0d63babce9fbeefbde65a36d6;p=webi-installers%2F.git

diff --git a/caddy/install.sh b/caddy/install.sh
index d46c52f..f59c42a 100644
--- a/caddy/install.sh
+++ b/caddy/install.sh
@@ -4,7 +4,7 @@
 # There is no magic!
 # The custom functions for Caddy are here.
 # The generic functions - version checks, download, extract, etc - are here:
-#   - https://github.com/webinstall/packages/branches/master/webi/template.bash
+#   - https://github.com/webinstall/packages/branches/master/_webi/template.sh
 
 set -e
 set -u
@@ -14,29 +14,29 @@ pkg_cmd_name="caddy"
 # IMPORTANT: this let's other functions know to expect this to be a single file
 WEBI_SINGLE=true
 
-pkg_get_current_version() {
+function pkg_get_current_version() {
     # 'caddy version' has output in this format:
     #       v2.1.0 h1:pQSaIJGFluFvu8KDGDODV8u4/QRED/OPyIR+MWYYse8=
     # This trims it down to just the version number:
-    #       2.0.0
-    echo "$(caddy version 2>/dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::')"
+    #       2.1.0
+    echo "$(caddy version 2> /dev/null | head -n 1 | cut -d' ' -f1 | sed 's:^v::')"
 }
 
-pkg_install() {
-    # $HOME/.local/xbin
+function pkg_install() {
+    # $HOME/.local/opt/caddy-v2.1.0/bin
     mkdir -p "$pkg_src_bin"
 
-    # mv ./caddy* "$HOME/.local/xbin/caddy-v2.0.0"
+    # mv ./caddy* "$HOME/.local/opt/caddy-v2.1.0/bin/caddy"
     mv ./"$pkg_cmd_name"* "$pkg_src_cmd"
 
-    # chmod a+x "$HOME/.local/xbin/caddy-v2.0.0"
+    # chmod a+x "$HOME/.local/opt/caddy-v2.1.0/bin/caddy"
     chmod a+x "$pkg_src_cmd"
 }
 
-pkg_link() {
+function pkg_link() {
     # rm -f "$HOME/.local/bin/caddy"
     rm -f "$pkg_dst_cmd"
 
-    # ln -s "$HOME/.local/xbin/caddy-v2.0.0" "$HOME/.local/bin/caddy"
+    # ln -s "$HOME/.local/opt/caddy-v2.1.0/bin/caddy" "$HOME/.local/bin/caddy"
     ln -s "$pkg_src_cmd" "$pkg_dst_cmd"
 }