Merge pull request #193 from sabbath88/main

Update chce_wireguard.sh, tested by @ferexio

scripts/chce_wireguard.sh

@@ -1,70 +1,115 @@
 #!/bin/bash
 # Autor skryptu: Andrzej Szczepaniak
-# Poprawki: Jakub 'unknow' Mrugalski
+# Współautor: Jakub 'unknow' Mrugalski
+# Aktualizacja: Dawid Kasza
+set -e
 
+# Backup the current resolv.conf file
 cp /etc/resolv.conf /etc/resolv.back
 
+# Update the package list and install necessary packages
 apt update
 apt install -y --no-install-recommends libmnl-dev make qrencode wireguard-tools resolvconf git iptables
 
+# Stop and disable resolvconf
 systemctl stop resolvconf
 systemctl disable resolvconf
+
+# Restore the original resolv.conf file
 mv /etc/resolv.back /etc/resolv.conf
 
+# Check for the presence of TUN/TAP device
 if [ ! -e /dev/net/tun ]; then
-    echo "Aby Wireguard działał poprawnie, musisz aktywować TUN/TAP na swoim serwerze";
-    exit
+   echo "To use Wireguard, you must enable TUN/TAP on your server."
+   exit 1
 fi
 
-cd /tmp/ && wget https://git.zx2c4.com/wireguard-go/snapshot/wireguard-go-0.0.20191012.tar.xz && tar -xvf wireguard-go-0.0.20191012.tar.xz && rm wireguard-go-0.0.20191012.tar.xz && mv wireguard-go-0.0.20191012 wireguard-go
+# Download and install Wireguard-Go
+cd /tmp/ || exit
+wget https://github.com/WireGuard/wireguard-go/archive/refs/heads/master.zip
+unzip -qq master.zip  -d wireguard-go
+rm master.zip
+
+# Clone the Wireguard tools repository
 git -c http.sslVerify=false clone https://git.zx2c4.com/wireguard-tools /tmp/wireguard-tools
 
+# Download and install Go
+# Check version at: https://go.dev/dl/
+GO_VERSION=$(curl -s "https://go.dev/VERSION?m=text" | head -n 1)
 
-wget https://dl.google.com/go/go1.16.4.linux-amd64.tar.gz -O /tmp/go1.16.4.linux-amd64.tar.gz
+GO_ARCHIVE_OUTPUT="/tmp/$GO_VERSION.linux-amd64.tar.gz"
+GO_INSTALL_PATH="/usr/local"
+GO_URL="https://go.dev/dl/$GO_VERSION.linux-amd64.tar.gz"
+
+# Remove older version of Go if exist
+if [ -d "/usr/local/go" ]; then
+  echo -e "Znaleziono stara wersje Go. Zostanie ona usunieta.\n"
+  rm -rf "/usr/local/go"
+fi
 
-cd /tmp/ && tar -zxvf go1.16.4.linux-amd64.tar.gz
-mv /tmp/go /usr/local
-export GOROOT=/usr/local/go
-export PATH=$GOPATH/bin:$GOROOT/bin:$PATH
+# Download Go archive
+echo -e "Pobieram $GO_VERSION.linux-amd64.tar.gz do katalogu $GO_ARCHIVE_OUTPUT\n"
+wget -q -O $GO_ARCHIVE_OUTPUT "$GO_URL"
 
-ln -s /usr/local/go/bin/go /usr/bin/
+# Extract Go archive
+echo -e "Wypakowuje $GO_ARCHIVE_OUTPUT do katalogu $GO_INSTALL_PATH\n"
+tar -xf $GO_ARCHIVE_OUTPUT -C $GO_INSTALL_PATH
 
-cd /tmp/wireguard-tools/src/ || exit
+# Add PATH env
+if [ $SUDO_USER ] && [ $SUDO_USER != "root" ] ; then
+  export PROFILE_PATH="/home/$SUDO_USER/.profile"
+else
+  export PROFILE_PATH="$HOME/.profile"
+fi
+
+# If Go PATH export doesn't exist, add it
+if ! grep 'export PATH=$PATH:/usr/local/go/bin' $PROFILE_PATH > /dev/null ; then
+  echo -e "Dodaje Go do PATH w pliku $PROFILE_PATH\n"
+  echo 'export PATH=$PATH:/usr/local/go/bin' >> $(ls $PROFILE_PATH)
+fi
+
+source ~/.profile
+
+# Build and install Wireguard tools
+cd /tmp/wireguard-go/wireguard-go-master
 make
 make install
 
-cd /tmp/wireguard-go/device/
-rm /tmp/wireguard-go/device/queueconstants_default.go && wget https://fx.vc-mp.eu/shared/queueconstants_default.go
-cd /tmp/wireguard-go && make
-cp /tmp/wireguard-go/wireguard-go /usr/bin
-
+# Generate Wireguard keys and set permissions
 wg genkey > /etc/wireguard/privatekey
 wg genkey > /etc/wireguard/client-privatekey
-
 chmod 600 /etc/wireguard/*privatekey*
 
-cat /etc/wireguard/privatekey | wg pubkey > /etc/wireguard/publickey
-cat /etc/wireguard/client-privatekey | wg pubkey > /etc/wireguard/client-publickey
+# Generate Wireguard public keys
+wg pubkey < /etc/wireguard/privatekey > /etc/wireguard/publickey
+wg pubkey < /etc/wireguard/client-privatekey > /etc/wireguard/client-publickey
+
+# Generate server configuration using a generator script
 srv=$(hostname)
 privkey=$(cat /etc/wireguard/privatekey)
 pubkey=$(cat /etc/wireguard/publickey)
 cliprivkey=$(cat /etc/wireguard/client-privatekey)
 clipubkey=$(cat /etc/wireguard/client-publickey)
 
-# generator configa umieszczony na serwerze Mikrusa
+# Use the generator script to create the server configuration
 curl -s -d "mode=wireguard-server&srv=$srv&privkey=$privkey&pubkey=$clipubkey" https://mikr.us/generator.php >/etc/wireguard/wg0.conf
 
-echo -e "\n\n==============\n\nKonfiguracja klienta:\n\n"
+echo -e "\n\n==============\n\nClient Configuration:\n\n"
+
+# Use the generator script to create the client configuration and display it
 curl -s -d "mode=wireguard-client&srv=$srv&privkey=$cliprivkey&pubkey=$pubkey" https://mikr.us/generator.php | tee /etc/wireguard/wg-client1.conf
 
+# Restart Wireguard with the modified configuration
 systemctl stop "wg-quick@wg0"
 sed -i '/RETRIES=infinity/{n;s/.*/Environment=WG_I_PREFER_BUGGY_USERSPACE_TO_POLISHED_KMOD=1/}' /lib/systemd/system/[email protected]
 systemctl daemon-reload
 echo "export WG_I_PREFER_BUGGY_USERSPACE_TO_POLISHED_KMOD=1" >> ~/.profile
 echo "export WG_I_PREFER_BUGGY_USERSPACE_TO_POLISHED_KMOD=1" >> ~/.bashrc
 systemctl start "wg-quick@wg0"
 
+# Generate a QR code for the client configuration
 qrencode -t ansiutf8 </etc/wireguard/wg-client1.conf
 
+# Clean up temporary files
 rm -rf /tmp/wireguard-tools
-rm -rf /tmp/wireguard-go
+rm -rf /tmp/wireguard-go