Pi-hole/pivpn
Pi-hole/pivpn
1
0
Fork 0
mirror of https://github.com/pivpn/pivpn.git synced 2025-04-25 16:50:12 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merging master comits into testing

Browse source
This commit is contained in:
cfcolaco 2017-10-08 11:26:42 +01:00
commit a5258d9f3c
2 changed files with 46 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

24
auto_install/install.sh
View file

@ -435,6 +435,7 @@ update_package_cache() {
timestampAsDate=$(date -d @"${timestamp}" "+%b %e")
today=$(date "+%b %e")
<<<<<<< HEAD
case ${PLAT} in
Ubuntu|Debian|Devuan)
case ${OSCN} in
@ -448,6 +449,17 @@ update_package_cache() {
esac
;;
esac
=======
if [[ ${PLAT} == "Ubuntu" || ${PLAT} == "Debian" ]]; then
if [[ ${OSCN} == "trusty" || ${OSCN} == "jessie" || ${OSCN} == "wheezy" ]]; then
wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add -
echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null
echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..."
$SUDO apt-get -qq update & spinner $!
echo " done!"
fi
fi
>>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a
if [ ! "${today}" == "${timestampAsDate}" ]; then
#update package lists
@ -531,6 +543,7 @@ checkForDependencies() {
timestampAsDate=$(date -d @"$timestamp" "+%b %e")
today=$(date "+%b %e")
<<<<<<< HEAD
case ${PLAT} in
Ubuntu|Debian|Devuan)
case ${OSCN} in
@ -544,6 +557,17 @@ checkForDependencies() {
esac
;;
esac
=======
if [[ $PLAT == "Ubuntu" || $PLAT == "Debian" ]]; then
if [[ $OSCN == "trusty" || $OSCN == "jessie" || $OSCN == "wheezy" ]]; then
wget -O - https://swupdate.openvpn.net/repos/repo-public.gpg| $SUDO apt-key add -
echo "deb http://build.openvpn.net/debian/openvpn/stable $OSCN main" | $SUDO tee /etc/apt/sources.list.d/swupdate.openvpn.net.list > /dev/null
echo -n "::: Adding OpenVPN repo for $PLAT $OSCN ..."
$SUDO apt-get -qq update & spinner $!
echo " done!"
fi
fi
>>>>>>> 454b755116d8cad6b67b56ac15a7235ceac02b5a
if [ ! "$today" == "$timestampAsDate" ]; then
#update package lists