cac: urlencode to bottom

1 files changed, 50 insertions, 52 deletions

diff --git a/cac-api b/cac-api
index b653323..174353c 100755
--- a/cac-api
+++ b/cac-api
@@ -9,57 +9,6 @@ set -euf
 #PATH=$PWD/bin:$PATH
 #export PATH
 
-urlencode() {
-#! /bin/sh
-sed '
-  s/%/%25/g
-  s/ /%20/g
-  s/!/%21/g
-  s/"/%22/g
-  s/#/%23/g
-  s/\$/%24/g
-  s/\&/%26/g
-  s/'\''/%27/g
-  s/(/%28/g
-  s/)/%29/g
-  s/\*/%2a/g
-  s/+/%2b/g
-  s/,/%2c/g
-  s/-/%2d/g
-  s/\./%2e/g
-  s/\//%2f/g
-  s/:/%3a/g
-  s/;/%3b/g
-  s//%3e/g
-  s/?/%3f/g
-  s/@/%40/g
-  s/\[/%5b/g
-  s/\\/%5c/g
-  s/\]/%5d/g
-  s/\^/%5e/g
-  s/_/%5f/g
-  s/`/%60/g
-  s/{/%7b/g
-  s/|/%7c/g
-  s/}/%7d/g
-  s/~/%7e/g
-'
-}
-netmask_to_prefix() {(
-#! /bin/sh
-set -euf
-
-netmask=$1
-
-binaryNetmask=$(echo $1 | sed 's/^/obase=2;/;s/\./;/g' | bc | tr -d \\n)
-binaryPrefix=$(echo $binaryNetmask | sed -n 's/^\(1*\)0*$/\1/p')
-if ! echo $binaryPrefix | grep -q .; then
-  echo $0: bad netmask: $netmask >&2
-  exit 4
-fi
-printf %s $binaryPrefix | tr -d 0 | wc -c
-)}
-#
 
 cac_resources_cache=${cac_resources_cache-$HOME/tmp/cac_resources_cache.json}
 cac_servers_cache=${cac_servers_cache-$HOME/tmp/cac_servers_cache.json}
@@ -68,7 +17,6 @@ cac_templates_cache=${cac_templates_cache-$HOME/tmp/cac_templates_cache.json}
 
 cac_secrets=${cac_secrets-$HOME/.secrets/cac-api}
 
-
 . "$cac_secrets" >/dev/null 2>&1 || :
 
 
@@ -484,8 +432,58 @@ _cac_exec() {
   fi
 }
 
+urlencode() {
+#! /bin/sh
+sed '
+  s/%/%25/g
+  s/ /%20/g
+  s/!/%21/g
+  s/"/%22/g
+  s/#/%23/g
+  s/\$/%24/g
+  s/\&/%26/g
+  s/'\''/%27/g
+  s/(/%28/g
+  s/)/%29/g
+  s/\*/%2a/g
+  s/+/%2b/g
+  s/,/%2c/g
+  s/-/%2d/g
+  s/\./%2e/g
+  s/\//%2f/g
+  s/:/%3a/g
+  s/;/%3b/g
+  s//%3e/g
+  s/?/%3f/g
+  s/@/%40/g
+  s/\[/%5b/g
+  s/\\/%5c/g
+  s/\]/%5d/g
+  s/\^/%5e/g
+  s/_/%5f/g
+  s/`/%60/g
+  s/{/%7b/g
+  s/|/%7c/g
+  s/}/%7d/g
+  s/~/%7e/g
+'
+}
 
+netmask_to_prefix() {(
+#! /bin/sh
+set -euf
+
+netmask=$1
 
+binaryNetmask=$(echo $1 | sed 's/^/obase=2;/;s/\./;/g' | bc | tr -d \\n)
+binaryPrefix=$(echo $binaryNetmask | sed -n 's/^\(1*\)0*$/\1/p')
+if ! echo $binaryPrefix | grep -q .; then
+  echo $0: bad netmask: $netmask >&2
+  exit 4
+fi
+printf %s $binaryPrefix | tr -d 0 | wc -c
+)}
+#
 
 
 case ${run-true} in