Add support for all known hooks

HenrikBengtsson · May 18, 2024 · 20b967e · 20b967e
1 parent 07257e9
commit 20b967e
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 19 deletions.
diff --git a/README.md b/README.md
@@ -202,7 +202,7 @@ Useful resources:
 * UCSF Managing Your Passwords:
   - https://it.ucsf.edu/services/managing-your-passwords
 
-Version: 5.8.0-9006
+Version: 5.8.0-9007
 Copyright: Henrik Bengtsson (2016-2024)
 License: GPL (>= 2.1) [https://www.gnu.org/licenses/gpl.html]
 Source: https://github.com/HenrikBengtsson/ucsf-vpn

diff --git a/bin/ucsf-vpn b/bin/ucsf-vpn
@@ -109,7 +109,7 @@
 ### * UCSF Managing Your Passwords:
 ###   - https://it.ucsf.edu/services/managing-your-passwords
 ###
-### Version: 5.8.0-9006
+### Version: 5.8.0-9007
 ### Copyright: Henrik Bengtsson (2016-2024)
 ### License: GPL (>= 2.1) [https://www.gnu.org/licenses/gpl.html]
 ### Source: https://github.com/HenrikBengtsson/ucsf-vpn
@@ -1209,7 +1209,7 @@ function source_envs() {
 
 
 function flavor_home() {
-    local path file pathname
+    local path hook pathname
     local -i count
 
     ## No flavor specified
@@ -1224,8 +1224,8 @@ function flavor_home() {
     fi
 
     count=0
-    for file in pre-connect.sh post-connect.sh; do
-        pathname=${path}/${file}
+    for hook in pre-init connect post-connect disconnect post-disconnect attempt-reconnect post-attempt-reconnect reconnect; do
+        pathname=${path}/${hook}.sh
         if [[ -f "${pathname}" ]]; then
             if ! bash -n "${pathname}"; then
                 merror "File syntax error: ${pathname}"
@@ -1283,11 +1283,7 @@ if [ -n "\${UCSF_VPN_VERSION}" ]; then
     ucsf_vpn_log "UCSF_VPN_VERSION=\${UCSF_VPN_VERSION}"
     ucsf_vpn_log "UCSF_VPN_FLAVOR=\${UCSF_VPN_FLAVOR}"
 
-    if [ "\$1" = "connect" ]; then
-        _hook_="pre-connect"
-    else
-        _hook_="\$1"
-    fi
+    _hook_="\$1"
     ucsf_vpn_log "hook=\${_hook_}"
 
     _hook_file_="\${UCSF_VPN_FLAVOR}/\${_hook_}.sh"

diff --git a/src/ucsf-vpn.sh b/src/ucsf-vpn.sh
@@ -106,7 +106,7 @@
 ### * UCSF Managing Your Passwords:
 ###   - https://it.ucsf.edu/services/managing-your-passwords
 ###
-### Version: 5.8.0-9006
+### Version: 5.8.0-9007
 ### Copyright: Henrik Bengtsson (2016-2024)
 ### License: GPL (>= 2.1) [https://www.gnu.org/licenses/gpl.html]
 ### Source: https://github.com/HenrikBengtsson/ucsf-vpn
@@ -318,7 +318,7 @@ function source_envs() {
 
 
 function flavor_home() {
-    local path file pathname
+    local path hook pathname
     local -i count
 
     ## No flavor specified
@@ -333,8 +333,8 @@ function flavor_home() {
     fi
 
     count=0
-    for file in pre-connect.sh post-connect.sh; do
-        pathname=${path}/${file}
+    for hook in pre-init connect post-connect disconnect post-disconnect attempt-reconnect post-attempt-reconnect reconnect; do
+        pathname=${path}/${hook}.sh
         if [[ -f "${pathname}" ]]; then
             if ! bash -n "${pathname}"; then
                 merror "File syntax error: ${pathname}"

diff --git a/src/vpnc/ucsf-vpn-flavors.sh b/src/vpnc/ucsf-vpn-flavors.sh
@@ -19,11 +19,7 @@ if [ -n "${UCSF_VPN_VERSION}" ]; then
     ucsf_vpn_log "UCSF_VPN_VERSION=${UCSF_VPN_VERSION}"
     ucsf_vpn_log "UCSF_VPN_FLAVOR=${UCSF_VPN_FLAVOR}"
 
-    if [ "$1" = "connect" ]; then
-        _hook_="pre-connect"
-    else
-        _hook_="$1"
-    fi
+    _hook_="$1"
     ucsf_vpn_log "hook=${_hook_}"
 
     _hook_file_="${UCSF_VPN_FLAVOR}/${_hook_}.sh"