Browse Source

export PATH variable and remove yunohost helpers

HgO 1 year ago
parent
commit
96cbe1b9dd
2 changed files with 4 additions and 4 deletions
  1. 2 2
      conf/scripts/route-down.d/20-unset-ipv6
  2. 2 2
      conf/scripts/route-up.d/20-set-ipv6

+ 2 - 2
conf/scripts/route-down.d/20-unset-ipv6

@@ -1,13 +1,13 @@
 #!/bin/bash
 
-source /usr/share/yunohost/helpers
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 is_ip6addr_set() {
   local ip6_addr=${1}
   ip address show dev tun0 2> /dev/null | grep -q "${ip6_addr}/"
 }
 
-ip6_addr=$(ynh_app_setting_get --app="vpnclient" --key="ip6_addr")
+ip6_addr=$(yunohost app setting "vpnclient" "ip6_addr")
 if [[ -n "${ip6_addr}" ]] && [[ "${ip6_addr}" != none ]] && is_ip6addr_set "${ip6_addr}"; then
   ip address delete "${ip6_addr}/64" dev tun0
 fi

+ 2 - 2
conf/scripts/route-up.d/20-set-ipv6

@@ -1,13 +1,13 @@
 #!/bin/bash
 
-source /usr/share/yunohost/helpers
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 is_ip6addr_set() {
   local ip6_addr=${1}
   ip address show dev tun0 2> /dev/null | grep -q "${ip6_addr}/"
 }
 
-ip6_addr=$(ynh_app_setting_get --app="vpnclient" --key="ip6_addr")
+ip6_addr=$(yunohost app setting "vpnclient" "ip6_addr")
 if [[ -n "${ip6_addr}" ]] && [[ "${ip6_addr}" != none ]] && ! is_ip6addr_set "${ip6_addr}"; then
   ip address add "${ip6_addr}/64" dev tun0
 fi