update before installation

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

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
 

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

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
 

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

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