From f8caf925279dc802cf72a1e949befed5b1137481 Mon Sep 17 00:00:00 2001
From: bedefaced <thisisnewlife@mail.ru>
Date: Fri, 1 Sep 2017 12:24:31 +0300
Subject: [PATCH] update before installation

---
 ipsec/env.sh       | 10 ++++++----
 ipsec/install.sh   |  3 ++-
 openvpn/env.sh     | 10 ++++++----
 openvpn/install.sh |  3 ++-
 pptp/env.sh        | 10 ++++++----
 pptp/install.sh    |  3 ++-
 6 files changed, 24 insertions(+), 15 deletions(-)

diff --git a/ipsec/env.sh b/ipsec/env.sh
index 1214238..cdb0289 100755
--- a/ipsec/env.sh
+++ b/ipsec/env.sh
@@ -8,8 +8,9 @@ if [ -n "$(. /etc/os-release; echo $NAME | grep -i Ubuntu)" -o -n "$(. /etc/os-r
 
 	IPTABLES_PACKAGE="iptables"
 	CRON_PACKAGE="cron"
-	INSTALLER="apt-get -y install"
-	UNINSTALLER="apt-get purge --auto-remove"
+	PCKTMANAGER="apt-get"
+	INSTALLER="$PCKTMANAGER -y install"
+	UNINSTALLER="$PCKTMANAGER purge --auto-remove"
 fi
 
 if [ -n "$(. /etc/os-release; echo $NAME | grep -i CentOS)" ]; then
@@ -17,8 +18,9 @@ if [ -n "$(. /etc/os-release; echo $NAME | grep -i CentOS)" ]; then
 
 	IPTABLES_PACKAGE="iptables-services"
 	CRON_PACKAGE="cronie"
-	INSTALLER="yum -y install"
-	UNINSTALLER="yum remove"
+	PCKTMANAGER="yum"
+	INSTALLER="$PCKTMANAGER -y install"
+	UNINSTALLER="$PCKTMANAGER remove"
 fi
 
 SYSCTLCONFIG=/etc/sysctl.conf
diff --git a/ipsec/install.sh b/ipsec/install.sh
index de7d244..8a96611 100755
--- a/ipsec/install.sh
+++ b/ipsec/install.sh
@@ -14,8 +14,9 @@ $DIR/backup.sh
 
 echo
 echo "Installing strongSwan and xl2tp server..."
+eval $PCKTMANAGER update
 if [ "$PLATFORM" == "$CENTOSPLATFORM" ]; then
-	yum -y install epel-release
+	eval $INSTALLER epel-release
 fi
 eval $INSTALLER strongswan xl2tpd ppp $CRON_PACKAGE $IPTABLES_PACKAGE procps net-tools
 
diff --git a/openvpn/env.sh b/openvpn/env.sh
index 23b1ac6..26a726e 100755
--- a/openvpn/env.sh
+++ b/openvpn/env.sh
@@ -8,8 +8,9 @@ if [ -n "$(. /etc/os-release; echo $NAME | grep -i Ubuntu)" -o -n "$(. /etc/os-r
 
 	IPTABLES_PACKAGE="iptables"
 	CRON_PACKAGE="cron"
-	INSTALLER="apt-get -y install"
-	UNINSTALLER="apt-get purge --auto-remove"
+	PCKTMANAGER="apt-get"
+	INSTALLER="$PCKTMANAGER -y install"
+	UNINSTALLER="$PCKTMANAGER purge --auto-remove"
 fi
 
 if [ -n "$(. /etc/os-release; echo $NAME | grep -i CentOS)" ]; then
@@ -17,8 +18,9 @@ if [ -n "$(. /etc/os-release; echo $NAME | grep -i CentOS)" ]; then
 
 	IPTABLES_PACKAGE="iptables-services"
 	CRON_PACKAGE="cronie"
-	INSTALLER="yum -y install"
-	UNINSTALLER="yum remove"
+	PCKTMANAGER="yum"
+	INSTALLER="$PCKTMANAGER -y install"
+	UNINSTALLER="$PCKTMANAGER remove"
 fi
 
 SYSCTLCONFIG=/etc/sysctl.conf
diff --git a/openvpn/install.sh b/openvpn/install.sh
index e1016c4..64106af 100755
--- a/openvpn/install.sh
+++ b/openvpn/install.sh
@@ -16,8 +16,9 @@ $DIR/backup.sh
 
 echo
 echo "Installing OpenVPN..."
+eval $PCKTMANAGER update
 if [ "$PLATFORM" == "$CENTOSPLATFORM" ]; then
-	yum -y install epel-release
+	eval $INSTALLER epel-release
 fi
 eval $INSTALLER openvpn easy-rsa $CRON_PACKAGE $IPTABLES_PACKAGE procps net-tools
 
diff --git a/pptp/env.sh b/pptp/env.sh
index 08c553d..45f5f7f 100755
--- a/pptp/env.sh
+++ b/pptp/env.sh
@@ -8,8 +8,9 @@ if [ -n "$(. /etc/os-release; echo $NAME | grep -i Ubuntu)" -o -n "$(. /etc/os-r
 
 	IPTABLES_PACKAGE="iptables"
 	CRON_PACKAGE="cron"
-	INSTALLER="apt-get -y install"
-	UNINSTALLER="apt-get purge --auto-remove"
+	PCKTMANAGER="apt-get"
+	INSTALLER="$PCKTMANAGER -y install"
+	UNINSTALLER="$PCKTMANAGER purge --auto-remove"
 fi
 
 if [ -n "$(. /etc/os-release; echo $NAME | grep -i CentOS)" ]; then
@@ -17,8 +18,9 @@ if [ -n "$(. /etc/os-release; echo $NAME | grep -i CentOS)" ]; then
 
 	IPTABLES_PACKAGE="iptables-services"
 	CRON_PACKAGE="cronie"
-	INSTALLER="yum -y install"
-	UNINSTALLER="yum remove"
+	PCKTMANAGER="yum"
+	INSTALLER="$PCKTMANAGER -y install"
+	UNINSTALLER="$PCKTMANAGER remove"
 fi
 
 SYSCTLCONFIG=/etc/sysctl.conf
diff --git a/pptp/install.sh b/pptp/install.sh
index 5cccb3b..061e271 100755
--- a/pptp/install.sh
+++ b/pptp/install.sh
@@ -14,8 +14,9 @@ $DIR/backup.sh
 
 echo
 echo "Installing PPTP server..."
+eval $PCKTMANAGER update
 if [ "$PLATFORM" == "$CENTOSPLATFORM" ]; then
-	yum -y install epel-release
+	eval $INSTALLER epel-release
 fi
 eval $INSTALLER ppp pptpd $CRON_PACKAGE $IPTABLES_PACKAGE procps net-tools