mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-12-25 06:10:20 +00:00
don't output "elevating with sudo" in pihole script, just do it.
This commit is contained in:
parent
97a013b2b7
commit
29ad2496b6
3 changed files with 73 additions and 8 deletions
12
advanced/Scripts/update.sh
Normal file
12
advanced/Scripts/update.sh
Normal file
|
@ -0,0 +1,12 @@
|
||||||
|
#!/usr/bin/env bash
|
||||||
|
# Pi-hole: A black hole for Internet advertisements
|
||||||
|
# (c) 2015, 2016 by Jacob Salmela
|
||||||
|
# Network-wide ad blocking via your Raspberry Pi
|
||||||
|
# http://pi-hole.net
|
||||||
|
# Whitelists domains
|
||||||
|
#
|
||||||
|
# Pi-hole is free software: you can redistribute it and/or modify
|
||||||
|
# it under the terms of the GNU General Public License as published by
|
||||||
|
# the Free Software Foundation, either version 2 of the License, or
|
||||||
|
# (at your option) any later version.
|
||||||
|
|
|
@ -10,6 +10,10 @@
|
||||||
# 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.
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
normalOutput(){
|
||||||
piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
|
piholeVersion=$(cd /etc/.pihole/ && git describe --tags --abbrev=0)
|
||||||
webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
|
webVersion=$(cd /var/www/html/admin/ && git describe --tags --abbrev=0)
|
||||||
|
|
||||||
|
@ -18,3 +22,14 @@ webVersionLatest=$(curl -s https://api.github.com/repos/pi-hole/AdminLTE/release
|
||||||
|
|
||||||
echo "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
|
echo "::: Pi-hole version is $piholeVersion (Latest version is $piholeVersionLatest)"
|
||||||
echo "::: Web-Admin version is $webVersion (Latest version is $webVersionLatest)"
|
echo "::: Web-Admin version is $webVersion (Latest version is $webVersionLatest)"
|
||||||
|
|
||||||
|
}
|
||||||
|
|
||||||
|
for var in "$@"
|
||||||
|
do
|
||||||
|
case "$var" in
|
||||||
|
"-j" | "--json" ) outputJSON;;
|
||||||
|
"-h" | "--help" ) displayHelp;;
|
||||||
|
* ) normalOutput;;
|
||||||
|
esac
|
||||||
|
done
|
52
pihole
52
pihole
|
@ -13,7 +13,6 @@
|
||||||
# Must be root to use this tool
|
# Must be root to use this tool
|
||||||
if [[ ! $EUID -eq 0 ]];then
|
if [[ ! $EUID -eq 0 ]];then
|
||||||
if [ -x "$(command -v sudo)" ];then
|
if [ -x "$(command -v sudo)" ];then
|
||||||
echo "::: Elevating to root with sudo"
|
|
||||||
exec sudo bash "$0" "$@"
|
exec sudo bash "$0" "$@"
|
||||||
exit $?
|
exit $?
|
||||||
else
|
else
|
||||||
|
@ -44,9 +43,48 @@ flushFunc() {
|
||||||
exit 0
|
exit 0
|
||||||
}
|
}
|
||||||
|
|
||||||
|
getGitFiles() {
|
||||||
|
# Setup git repos for directory and repository passed
|
||||||
|
# as arguments 1 and 2
|
||||||
|
echo ":::"
|
||||||
|
echo "::: Checking for existing repository..."
|
||||||
|
if is_repo "${1}"; then
|
||||||
|
update_repo "${1}"
|
||||||
|
else
|
||||||
|
make_repo "${1}" "${2}"
|
||||||
|
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() {
|
||||||
|
|
||||||
|
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
|
if [ ! -d "/etc/.pihole" ]; then #This is unlikely
|
||||||
echo "::: Critical Error: Pi-Hole repo missing from system!"
|
echo "::: Critical Error: Pi-Hole repo missing from system!"
|
||||||
echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
|
echo "::: Please re-run install script from https://github.com/pi-hole/pi-hole"
|
||||||
|
@ -75,17 +113,17 @@ updatePiholeFunc() {
|
||||||
echo ":::"
|
echo ":::"
|
||||||
|
|
||||||
if [[ ${webVersion} == ${webVersionLatest} ]] ; then
|
if [[ ${webVersion} == ${webVersionLatest} ]] ; then
|
||||||
echo "::: Web Admin files are already up to date!"
|
echo "::: Web Admin files are already up to date! Version: ${webVersionLatest}"
|
||||||
echo "::: No need to update!"
|
echo "::: No need to update!"
|
||||||
echo ":::"
|
echo ":::"
|
||||||
else
|
else
|
||||||
echo "::: An Update is available for the Web Admin!"
|
echo "::: An Update is available for the Web Admin!"
|
||||||
echo ":::"
|
echo ":::"
|
||||||
echo "::: Fetching latest changes from GitHub..."
|
echo "::: Fetching latest changes from GitHub..."
|
||||||
cd /var/www/html/admin
|
# Update Git files for Core
|
||||||
git pull origin master
|
getGitFiles ${webInterfaceDir} ${webInterfaceGitUrl}
|
||||||
echo ":::"
|
echo ":::"
|
||||||
echo "::: Pi-hole Web Admin has been updated to ${webVersion}"
|
echo "::: Pi-hole Web Admin has been updated to ${webVersionLatest}"
|
||||||
echo "::: See https://changes.pi-hole.net for details"
|
echo "::: See https://changes.pi-hole.net for details"
|
||||||
fi
|
fi
|
||||||
else
|
else
|
||||||
|
@ -97,8 +135,8 @@ updatePiholeFunc() {
|
||||||
fi
|
fi
|
||||||
|
|
||||||
echo "::: Fetching latest changes from GitHub..."
|
echo "::: Fetching latest changes from GitHub..."
|
||||||
cd /etc/.pihole
|
# Update Git files for Core
|
||||||
git pull origin master
|
getGitFiles ${piholeFilesDir} ${piholeGitUrl}
|
||||||
/etc/.pihole/automated\ install/basic-install.sh --unattended
|
/etc/.pihole/automated\ install/basic-install.sh --unattended
|
||||||
|
|
||||||
echo ":::"
|
echo ":::"
|
||||||
|
|
Loading…
Reference in a new issue