From 2bd37ccf6630ea8ac57aa3d53d55a12a34ca7101 Mon Sep 17 00:00:00 2001
From: hwdsl2 <hwdsl2@users.noreply.github.com>
Date: Sun, 23 Oct 2022 14:05:57 -0500
Subject: [PATCH] Cleanup

- Save a redirect and make VPN setup slightly faster by using
  raw.githubusercontent.com directly instead of
  https://github.com/hwdsl2/setup-ipsec-vpn/raw/...
---
 azure/install.sh            | 2 +-
 extras/quickstart.sh        | 2 +-
 extras/vpnupgrade.sh        | 2 +-
 extras/vpnupgrade_alpine.sh | 2 +-
 extras/vpnupgrade_amzn.sh   | 2 +-
 extras/vpnupgrade_centos.sh | 2 +-
 extras/vpnupgrade_ubuntu.sh | 2 +-
 vpnsetup.sh                 | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/azure/install.sh b/azure/install.sh
index 15ea31f..78c223b 100755
--- a/azure/install.sh
+++ b/azure/install.sh
@@ -4,4 +4,4 @@ export VPN_IPSEC_PSK=$1
 export VPN_USER=$2
 export VPN_PASSWORD=$3
 
-wget -t 3 -T 30 -nv -O vpn.sh https://github.com/hwdsl2/setup-ipsec-vpn/raw/master/vpnsetup.sh && sh vpn.sh
+wget -t 3 -T 30 -nv -O vpn.sh https://raw.githubusercontent.com/hwdsl2/setup-ipsec-vpn/master/vpnsetup.sh && sh vpn.sh
diff --git a/extras/quickstart.sh b/extras/quickstart.sh
index 3997b62..0593eb1 100755
--- a/extras/quickstart.sh
+++ b/extras/quickstart.sh
@@ -245,7 +245,7 @@ install_pkgs() {
 }
 
 get_setup_url() {
-  base_url1="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master"
+  base_url1="https://raw.githubusercontent.com/hwdsl2/setup-ipsec-vpn/master"
   base_url2="https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master"
   sh_file="vpnsetup_ubuntu.sh"
   if [ "$os_type" = "centos" ] || [ "$os_type" = "rhel" ] || [ "$os_type" = "rocky" ] \
diff --git a/extras/vpnupgrade.sh b/extras/vpnupgrade.sh
index fa14360..deb0682 100755
--- a/extras/vpnupgrade.sh
+++ b/extras/vpnupgrade.sh
@@ -141,7 +141,7 @@ install_pkgs() {
 }
 
 get_setup_url() {
-  base_url1="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master/extras"
+  base_url1="https://raw.githubusercontent.com/hwdsl2/setup-ipsec-vpn/master/extras"
   base_url2="https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master/extras"
   sh_file="vpnupgrade_ubuntu.sh"
   if [ "$os_type" = "centos" ] || [ "$os_type" = "rhel" ] || [ "$os_type" = "rocky" ] \
diff --git a/extras/vpnupgrade_alpine.sh b/extras/vpnupgrade_alpine.sh
index 3b419a8..cfaf907 100755
--- a/extras/vpnupgrade_alpine.sh
+++ b/extras/vpnupgrade_alpine.sh
@@ -199,7 +199,7 @@ EOF
 update_ikev2_script() {
   bigecho "Updating IKEv2 script..."
   cd /opt/src || exit 1
-  ikev2_url="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master/extras/ikev2setup.sh"
+  ikev2_url="https://raw.githubusercontent.com/hwdsl2/setup-ipsec-vpn/master/extras/ikev2setup.sh"
   (
     set -x
     wget -t 3 -T 30 -q -O ikev2.sh.new "$ikev2_url"
diff --git a/extras/vpnupgrade_amzn.sh b/extras/vpnupgrade_amzn.sh
index c2abb04..69e6bd8 100755
--- a/extras/vpnupgrade_amzn.sh
+++ b/extras/vpnupgrade_amzn.sh
@@ -195,7 +195,7 @@ restore_selinux() {
 update_ikev2_script() {
   bigecho "Updating IKEv2 script..."
   cd /opt/src || exit 1
-  ikev2_url="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master/extras/ikev2setup.sh"
+  ikev2_url="https://raw.githubusercontent.com/hwdsl2/setup-ipsec-vpn/master/extras/ikev2setup.sh"
   (
     set -x
     wget -t 3 -T 30 -q -O ikev2.sh.new "$ikev2_url"
diff --git a/extras/vpnupgrade_centos.sh b/extras/vpnupgrade_centos.sh
index 8a6bbba..f93505c 100755
--- a/extras/vpnupgrade_centos.sh
+++ b/extras/vpnupgrade_centos.sh
@@ -247,7 +247,7 @@ restore_selinux() {
 update_ikev2_script() {
   bigecho "Updating IKEv2 script..."
   cd /opt/src || exit 1
-  ikev2_url="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master/extras/ikev2setup.sh"
+  ikev2_url="https://raw.githubusercontent.com/hwdsl2/setup-ipsec-vpn/master/extras/ikev2setup.sh"
   (
     set -x
     wget -t 3 -T 30 -q -O ikev2.sh.new "$ikev2_url"
diff --git a/extras/vpnupgrade_ubuntu.sh b/extras/vpnupgrade_ubuntu.sh
index ea9e976..aaeacbe 100755
--- a/extras/vpnupgrade_ubuntu.sh
+++ b/extras/vpnupgrade_ubuntu.sh
@@ -258,7 +258,7 @@ EOF
 update_ikev2_script() {
   bigecho "Updating IKEv2 script..."
   cd /opt/src || exit 1
-  ikev2_url="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master/extras/ikev2setup.sh"
+  ikev2_url="https://raw.githubusercontent.com/hwdsl2/setup-ipsec-vpn/master/extras/ikev2setup.sh"
   (
     set -x
     wget -t 3 -T 30 -q -O ikev2.sh.new "$ikev2_url"
diff --git a/vpnsetup.sh b/vpnsetup.sh
index 3997b62..0593eb1 100755
--- a/vpnsetup.sh
+++ b/vpnsetup.sh
@@ -245,7 +245,7 @@ install_pkgs() {
 }
 
 get_setup_url() {
-  base_url1="https://github.com/hwdsl2/setup-ipsec-vpn/raw/master"
+  base_url1="https://raw.githubusercontent.com/hwdsl2/setup-ipsec-vpn/master"
   base_url2="https://gitlab.com/hwdsl2/setup-ipsec-vpn/-/raw/master"
   sh_file="vpnsetup_ubuntu.sh"
   if [ "$os_type" = "centos" ] || [ "$os_type" = "rhel" ] || [ "$os_type" = "rocky" ] \