add initial plugin stuff to vpnkit

cloudflightio · Nov 29, 2022 · f64afee · f64afee
1 parent 49a2ace
commit f64afee
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/docker/root/etc/DockerInWsl/diw-commons.sh b/docker/root/etc/DockerInWsl/diw-commons.sh
@@ -11,7 +11,10 @@ log() {
 
 ### common vars
 CMDSHELL="$(command -v cmd.exe || echo '/mnt/c/Windows/system32/cmd.exe')"
+PROGRAMFILES="$(wslpath "$($CMDSHELL /V:OFF /C 'echo %PROGRAMFILES%' | tr -d '\n\r')")"
 APPDATA="$(wslpath "$($CMDSHELL /V:OFF /C 'echo %APPDATA%' | tr -d '\n\r')")"
+LOCALAPPDATA="$(wslpath "$($CMDSHELL /V:OFF /C 'echo %LOCALAPPDATA%' | tr -d '\n\r')")"
+
 DIW_USER="docker"
 DIW_LINUSER_HOME="/home/${DIW_USER}"
 DIW_WINUSER_HOME="$(wslpath "$($CMDSHELL /V:OFF /C 'echo %USERPROFILE%' | tr -d '\n\r')")"

diff --git a/docker/root/usr/local/bin/wsl-vpnkit b/docker/root/usr/local/bin/wsl-vpnkit
@@ -20,10 +20,9 @@
 # USE OR OTHER DEALINGS IN THE SOFTWARE.
 
 set -eo pipefail
+. /etc/DockerInWsl/diw-commons.sh
+_diw_plugin_globalvars
 
-CMDSHELL="$(command -v cmd.exe || echo '/mnt/c/Windows/system32/cmd.exe')"
-PROGRAMFILES="$(wslpath "$($CMDSHELL /V:OFF /C 'echo %PROGRAMFILES%' | tr -d '\n\r')")"
-LOCALAPPDATA="$(wslpath "$($CMDSHELL /V:OFF /C 'echo %LOCALAPPDATA%' | tr -d '\n\r')")"
 CONF_PATH="$LOCALAPPDATA/DockerInWSL/wsl-vpnkit/wsl-vpnkit.conf"
 HTTP_PROXY_CONFIG_PATH="$LOCALAPPDATA/DockerInWSL/wsl-vpnkit/http-proxy.json"
 SOCKET_PATH="/var/run/wsl-vpnkit.sock"