Pi-hole/pi-hole
Pi-hole/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole.git synced 2025-01-11 22:44:44 +00:00
Code Issues Projects Releases Packages Wiki Activity

col_table does not exist yet, will break the install if pushed as hotfix.

Browse source 
Not sure why these additional "'s were put in, they break the update command, too.

Signed-off-by: Adam Warner <adamw@rner.email>
This commit is contained in:
Adam Warner 2017-07-17 10:53:49 +01:00
parent 05c8687041
commit 70fb733fea
No known key found for this signature in database
GPG key ID: 03843F6C65554B22
1 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
advanced/Scripts/update.sh
View file

@ -26,8 +26,6 @@ PH_TEST=true
#shellcheck disable=SC1090 #shellcheck disable=SC1090
source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh" source "${PI_HOLE_FILES_DIR}/automated install/basic-install.sh"
source "/opt/pihole/COL_TABLE"
# is_repo() sourced from basic-install.sh # is_repo() sourced from basic-install.sh
# make_repo() sourced from basic-install.sh # make_repo() sourced from basic-install.sh
# update_repo() source from basic-install.sh # update_repo() source from basic-install.sh
@ -43,7 +41,7 @@ GitCheckUpdateAvail() {
# @ alone is a shortcut for HEAD. Older versions of git # @ alone is a shortcut for HEAD. Older versions of git
# need @{0} # need @{0}
LOCAL="$("git rev-parse @{0}")" LOCAL="$(git rev-parse @{0})"
# The suffix @{upstream} to a branchname # The suffix @{upstream} to a branchname
# (short form <branchname>@{u}) refers # (short form <branchname>@{u}) refers
@ -52,7 +50,7 @@ GitCheckUpdateAvail() {
# (configured with branch.<name>.remote and # (configured with branch.<name>.remote and
# branch.<name>.merge). A missing branchname # branch.<name>.merge). A missing branchname
# defaults to the current one. # defaults to the current one.
REMOTE="$("git rev-parse @{upstream}")" REMOTE="$(git rev-parse @{upstream})"
if [[ ${#LOCAL} == 0 ]]; then if [[ ${#LOCAL} == 0 ]]; then
echo "::: Error: Local revision could not be obtained, ask Pi-hole support." echo "::: Error: Local revision could not be obtained, ask Pi-hole support."