mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-11-15 10:43:55 +00:00
remove prematurely added code
This commit is contained in:
Adam Warner
parent
77e8be09a1
commit
ce46c4dec4
2 changed files with 72 additions and 94 deletions
|
|
@ -10,3 +10,73 @@
|
||||||
# the Free Software Foundation, either version 2 of the License, or
|
# the Free Software Foundation, either version 2 of the License, or
|
||||||
# (at your option) any later version.
|
# (at your option) any later version.
|
||||||
|
|
||||||
|
# Variables
|
||||||
|
webInterfaceGitUrl="https://github.com/pi-hole/AdminLTE.git"
|
||||||
|
webInterfaceDir="/var/www/html/admin"
|
||||||
|
piholeGitUrl="https://github.com/pi-hole/pi-hole.git"
|
||||||
|
piholeFilesDir="/etc/.pihole"
|
||||||
|
|
||||||
|
if [ ! -d "/etc/.pihole" ]; then #This is unlikely
|
||||||
|
echo "::: Critical Error: Pi-Hole repo missing from system!"
|
||||||
|
echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
if [ ! -d "/var/www/html/admin" ]; then #This is unlikely
|
||||||
|
echo "::: Critical Error: Pi-Hole repo missing from system!"
|
||||||
|
echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
|
||||||
|
exit 1;
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "::: Checking for updates..."
|
||||||
|
piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
|
||||||
|
piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
|
||||||
|
|
||||||
|
webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
|
||||||
|
webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
|
||||||
|
|
||||||
|
echo "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
|
||||||
|
echo "::: Web Admin version is $webVersion (Latest version is $webVersionLatest)"
|
||||||
|
echo ":::"
|
||||||
|
|
||||||
|
if [[ ${piholeVersion} == ${piholeVersionLatest} ]] ; then
|
||||||
|
echo "::: Pi-hole Base files are already up to date! Version: ${piholeVersionLatest}"
|
||||||
|
echo "::: No need to update!"
|
||||||
|
echo ":::"
|
||||||
|
|
||||||
|
if [[ ${webVersion} == ${webVersionLatest} ]] ; then
|
||||||
|
echo "::: Web Admin files are already up to date! Version: ${webVersionLatest}"
|
||||||
|
echo "::: No need to update!"
|
||||||
|
echo ":::"
|
||||||
|
else
|
||||||
|
echo "::: An Update is available for the Web Admin!"
|
||||||
|
echo ":::"
|
||||||
|
echo "::: Fetching latest changes from GitHub..."
|
||||||
|
# Update Git files for Core
|
||||||
|
getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl}
|
||||||
|
echo ":::"
|
||||||
|
echo "::: Pi-hole Web Admin has been updated to ${webVersionLatest}"
|
||||||
|
echo "::: See https://changes.pi-hole.net for details"
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
echo -n "::: An update is available for "
|
||||||
|
if [[ ${webVersion} == ${webVersionLatest} ]] ; then
|
||||||
|
echo " Pi-Hole!"
|
||||||
|
else
|
||||||
|
echo " Pi-Hole base files and the Web Admin. Both will be updated!"
|
||||||
|
fi
|
||||||
|
|
||||||
|
echo "::: Fetching latest changes from GitHub..."
|
||||||
|
# Update Git files for Core
|
||||||
|
getGitFiles ${piholeFilesDir} ${piholeGitUrl}
|
||||||
|
/etc/.pihole/automated\ install/basic-install.sh --unattended
|
||||||
|
|
||||||
|
echo ":::"
|
||||||
|
echo "::: Pi-hole has been updated to version ${piholeVersionLatest}"
|
||||||
|
if [[ ${webVersion} != ${webVersionLatest} ]] ; then
|
||||||
|
echo "::: Web Admin has been updated to version ${webVersionLatest}"
|
||||||
|
fi
|
||||||
|
echo ":::"
|
||||||
|
echo "::: See https://changes.pi-hole.net for details"
|
||||||
|
fi
|
||||||
|
|
||||||
|
exit 0
|
||||||
96
pihole
96
pihole
|
|
@ -55,100 +55,8 @@ getGitFiles() {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
is_repo() {
|
|
||||||
# Use git to check if directory is currently under VCS
|
|
||||||
echo -n "::: Checking $1 is a repo..."
|
|
||||||
cd "${1}" &> /dev/null || return 1
|
|
||||||
git status &> /dev/null && echo " OK!"; return 0 || echo " not found!"; return 1
|
|
||||||
}
|
|
||||||
|
|
||||||
make_repo() {
|
|
||||||
# Remove the non-repod interface and clone the interface
|
|
||||||
echo -n "::: Cloning $2 into $1..."
|
|
||||||
rm -rf "${1}"
|
|
||||||
git clone -q --depth 1 "${2}" "${1}" > /dev/null & spinner $!
|
|
||||||
echo " done!"
|
|
||||||
}
|
|
||||||
|
|
||||||
update_repo() {
|
|
||||||
# Pull the latest commits
|
|
||||||
echo -n "::: Updating repo in $1..."
|
|
||||||
cd "${1}" || exit 1
|
|
||||||
git pull -q > /dev/null & spinner $!
|
|
||||||
echo " done!"
|
|
||||||
}
|
|
||||||
|
|
||||||
updatePiholeFunc() {
|
updatePiholeFunc() {
|
||||||
|
echo "Not Implemented"
|
||||||
webInterfaceGitUrl="https://github.com/pi-hole/AdminLTE.git"
|
|
||||||
webInterfaceDir="/var/www/html/admin"
|
|
||||||
piholeGitUrl="https://github.com/pi-hole/pi-hole.git"
|
|
||||||
piholeFilesDir="/etc/.pihole"
|
|
||||||
|
|
||||||
if [ ! -d "/etc/.pihole" ]; then #This is unlikely
|
|
||||||
echo "::: Critical Error: Pi-Hole repo missing from system!"
|
|
||||||
echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
if [ ! -d "/var/www/html/admin" ]; then #This is unlikely
|
|
||||||
echo "::: Critical Error: Pi-Hole repo missing from system!"
|
|
||||||
echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
|
|
||||||
exit 1;
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "::: Checking for updates..."
|
|
||||||
piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
|
|
||||||
piholeVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/pi-hole/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
|
|
||||||
|
|
||||||
webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
|
|
||||||
webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/releases/latest | grep -Po '"tag_name":.*?[^\\]",' | perl -pe 's/"tag_name": "//; s/^"//; s/",$//')
|
|
||||||
|
|
||||||
echo "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
|
|
||||||
echo "::: Web Admin version is $webVersion (Latest version is $webVersionLatest)"
|
|
||||||
echo ":::"
|
|
||||||
|
|
||||||
if [[ ${piholeVersion} == ${piholeVersionLatest} ]] ; then
|
|
||||||
echo "::: Pi-hole Base files are already up to date! Version: ${piholeVersionLatest}"
|
|
||||||
echo "::: No need to update!"
|
|
||||||
echo ":::"
|
|
||||||
|
|
||||||
if [[ ${webVersion} == ${webVersionLatest} ]] ; then
|
|
||||||
echo "::: Web Admin files are already up to date! Version: ${webVersionLatest}"
|
|
||||||
echo "::: No need to update!"
|
|
||||||
echo ":::"
|
|
||||||
else
|
|
||||||
echo "::: An Update is available for the Web Admin!"
|
|
||||||
echo ":::"
|
|
||||||
echo "::: Fetching latest changes from GitHub..."
|
|
||||||
# Update Git files for Core
|
|
||||||
getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl}
|
|
||||||
echo ":::"
|
|
||||||
echo "::: Pi-hole Web Admin has been updated to ${webVersionLatest}"
|
|
||||||
echo "::: See https://changes.pi-hole.net for details"
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo -n "::: An update is available for "
|
|
||||||
if [[ ${webVersion} == ${webVersionLatest} ]] ; then
|
|
||||||
echo " Pi-Hole!"
|
|
||||||
else
|
|
||||||
echo " Pi-Hole base files and the Web Admin. Both will be updated!"
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "::: Fetching latest changes from GitHub..."
|
|
||||||
# Update Git files for Core
|
|
||||||
getGitFiles ${piholeFilesDir} ${piholeGitUrl}
|
|
||||||
/etc/.pihole/automated\ install/basic-install.sh --unattended
|
|
||||||
|
|
||||||
echo ":::"
|
|
||||||
echo "::: Pi-hole has been updated to version ${piholeVersionLatest}"
|
|
||||||
if [[ ${webVersion} != ${webVersionLatest} ]] ; then
|
|
||||||
echo "::: Web Admin has been updated to version ${webVersionLatest}"
|
|
||||||
fi
|
|
||||||
echo ":::"
|
|
||||||
echo "::: See https://changes.pi-hole.net for details"
|
|
||||||
fi
|
|
||||||
|
|
||||||
exit 0
|
|
||||||
}
|
}
|
||||||
|
|
||||||
reconfigurePiholeFunc() {
|
reconfigurePiholeFunc() {
|
||||||
|
|
@ -202,7 +110,7 @@ helpFunc() {
|
||||||
echo "::: Control all PiHole specific functions!"
|
echo "::: Control all PiHole specific functions!"
|
||||||
echo ":::"
|
echo ":::"
|
||||||
echo "::: Usage: pihole [options]"
|
echo "::: Usage: pihole [options]"
|
||||||
echo "::: Add -h after -w (whitelist), -b (blacklist), or -c (chronometer) for more information on usage"
|
echo "::: Add -h after -w (whitelist), -b (blacklist), or -c (chronometer), or -v (version) for more information on usage"
|
||||||
echo ":::"
|
echo ":::"
|
||||||
echo "::: Options:"
|
echo "::: Options:"
|
||||||
echo "::: -w, whitelist Whitelist domains"
|
echo "::: -w, whitelist Whitelist domains"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue