From 09f8114cc0fa2a5b6ec231f93a6e4c6e773b6fa1 Mon Sep 17 00:00:00 2001
From: "Matthew R. Kasun" <mkasun@nusak.ca>
Date: Thu, 10 Feb 2022 09:56:46 -0500
Subject: [PATCH 1/2] removed installation of freebsd daemon (done by
 netclient) updated openwrt daemon to installl in /sbin and update command to
 be run removed x86_32 add support for arch

---
 scripts/netclient-install.sh | 45 ++++++------------------------------
 1 file changed, 7 insertions(+), 38 deletions(-)

diff --git a/scripts/netclient-install.sh b/scripts/netclient-install.sh
index 88f219e2..9024c038 100755
--- a/scripts/netclient-install.sh
+++ b/scripts/netclient-install.sh
@@ -118,9 +118,6 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
 			x86_64)
 				dist=netclient
 			;;
-                        x86_32)
-                                dist=netclient-32
-                        ;;
  			arm64)
 				dist=netclient-arm64
 			;;
@@ -160,9 +157,6 @@ case $(uname | tr '[:upper:]' '[:lower:]') in
 			x86_64)
 				dist=netclient-freebsd
 			;;
-                        x86_32)
-                                dist=netclient-freebsd-32
-                        ;;
  			arm64)
 				dist=netclient-freebsd-arm64
 			;;
@@ -200,7 +194,7 @@ fi
 chmod +x netclient
 
 EXTRA_ARGS=""
-if [ "${OS}" = "FreeBSD" ] || [ "${OS}" = "OpenWRT" ]; then
+if [  "${OS}" = "OpenWRT" ]; then
 	EXTRA_ARGS="--daemon=off"
 fi
 
@@ -210,34 +204,9 @@ else
   ./netclient join -t $KEY --name $NAME $EXTRA_ARGS
 fi
 
-if [ "${OS}" = "FreeBSD" ]; then
-	mv ./netclient /etc/netclient/netclient
-	cat << 'END_OF_FILE' > ./netclient.service.tmp
-#!/bin/sh
 
-# PROVIDE: netclient
-# REQUIRE: LOGIN DAEMON NETWORKING SERVERS FILESYSTEM
-# BEFORE:  
-# KEYWORD: shutdown
-. /etc/rc.subr
-
-name="netclient"
-rcvar=netclient_enable
-pidfile="/var/run/${name}.pid"
-command="/sbin/daemon"
-command_args="-c -f -P ${pidfile} -R 10 -t "Netclient" -u root -o /etc/netclient/netclient.log /etc/netclient/netclient checkin -n all"
-
-load_rc_config $name
-run_rc_command "$1"
-
-END_OF_FILE
-	sudo mv ./netclient.service.tmp /usr/local/etc/rc.d/netclient
-	sudo chmod +x /usr/local/etc/rc.d/netclient
-	sudo /usr/local/etc/rc.d/netclient enable
-	sudo /usr/local/etc/rc.d/netclient start
-
-elif [ "${OS}" = "OpenWRT" ]; then
-	mv ./netclient /etc/netclient/netclient
+if [ "${OS}" = "OpenWRT" ]; then
+	mv ./netclient /sbin/netclient
 	cat << 'END_OF_FILE' > ./netclient.service.tmp
 #!/bin/sh /etc/rc.common
 
@@ -251,18 +220,18 @@ start() {
   if [ ! -f "${LOG_FILE}" ];then
       touch "${LOG_FILE}"
   fi
-  local PID=$(ps|grep "netclient checkin -n all"|grep -v grep|awk '{print $1}')
+  local PID=$(ps|grep "netclient daemon"|grep -v grep|awk '{print $1}')
   if [ "${PID}" ];then
     echo "service is running"
     return
   fi
-  bash -c "while [ 1 ]; do /etc/netclient/netclient checkin -n all >> ${LOG_FILE} 2>&1;sleep 15;\
+  bash -c "do /sbin/netclient daemon  >> ${LOG_FILE} 2>&1;\
            if [ $(ls -l ${LOG_FILE}|awk '{print $5}') -gt 10240000 ];then tar zcf "${LOG_FILE}.tar" -C / "tmp/netclient.logs"  && > $LOG_FILE;fi;done &"
   echo "start"
 }
 
 stop() {
-  pids=$(ps|grep "netclient checkin -n all"|grep -v grep|awk '{print $1}')
+  pids=$(ps|grep "netclient daemon"|grep -v grep|awk '{print $1}')
   for i in "${pids[@]}"
   do
 	if [ "${i}" ];then
@@ -273,7 +242,7 @@ stop() {
 }
 
 status() {
-  local PID=$(ps|grep "netclient checkin -n all"|grep -v grep|awk '{print $1}')
+  local PID=$(ps|grep "netclient daemon"|grep -v grep|awk '{print $1}')
   if [ "${PID}" ];then
     echo -e "netclient[${PID}] is running \n"
   else

From abd1ad60ddce793ae1f5527e7a9c5c6e63b92bb3 Mon Sep 17 00:00:00 2001
From: "Matthew R. Kasun" <mkasun@nusak.ca>
Date: Thu, 10 Feb 2022 10:13:54 -0500
Subject: [PATCH 2/2] remove x86_32 remove freebsd daemon as --deamon on is now
 valid for freebsd updated openWRT daemon to use new paths and arguments add
 support for arch installs

---
 scripts/netclient-install.sh | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/scripts/netclient-install.sh b/scripts/netclient-install.sh
index 9024c038..7e65e069 100755
--- a/scripts/netclient-install.sh
+++ b/scripts/netclient-install.sh
@@ -25,6 +25,10 @@ elif [ -f /etc/fedora-release ]; then
 	dependencies="wireguard"
 	update_cmd='dnf update'
 	install_cmd='dnf install -y'
+elif [ -f /etc/arch-releae ]; then
+    	dependecies="wireguard-tools"
+	update_cmd='pacman -Sy'
+	install_cmd='pacman -S --noconfirm'
 elif [ "${OS}" = "FreeBSD" ]; then
 	dependencies="wireguard"
 	update_cmd='pkg update'