diff options
Diffstat (limited to 'version.patch')
| -rw-r--r-- | version.patch | 103 |
1 files changed, 40 insertions, 63 deletions
diff --git a/version.patch b/version.patch index 0c0eb70fba30..5979ad8f42a5 100644 --- a/version.patch +++ b/version.patch @@ -1,72 +1,49 @@ -diff -ur pi-hole-3.1/advanced/Scripts/version.sh pi-hole-3.1.a/advanced/Scripts/version.sh ---- pi-hole-3.1/advanced/Scripts/version.sh 2017-06-20 23:17:41.000000000 +0200 -+++ pi-hole-3.1.a/advanced/Scripts/version.sh 2017-06-22 13:52:36.293206505 +0200 -@@ -20,63 +20,21 @@ - return 0 - fi +--- pi-hole-4.0.a/advanced/Scripts/version.sh 2018-08-05 19:40:22.000000000 +0200 ++++ pi-hole-4.0/advanced/Scripts/version.sh 2018-08-24 15:28:44.141363877 +0200 +@@ -20,42 +20,16 @@ + return 0 + fi -- # Get the tagged version of the local repository -- local directory="${1}" -- local version +- # Get the tagged version of the local repository +- local directory="${1}" +- local version - -- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; } -- version=$(git describe --tags --always || echo "$DEFAULT") -- if [[ "${version}" =~ ^v ]]; then -- echo "${version}" -- elif [[ "${version}" == "${DEFAULT}" ]]; then -- echo "ERROR" -- return 1 -+ if [[ "$1" == "pi-hole" ]]; then -+ echo "{{corever}}" - else -- echo "Untagged" -+ echo "{{webver}}" - fi - return 0 +- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; } +- version=$(git describe --tags --always || echo "$DEFAULT") +- if [[ "${version}" =~ ^v ]]; then +- echo "${version}" +- elif [[ "${version}" == "${DEFAULT}" ]]; then +- echo "ERROR" +- return 1 ++ if [[ "$1" == "pi-hole" ]]; then ++ echo "{{corever}}" + else +- echo "Untagged" ++ echo "{{webver}}" + fi + return 0 } getLocalHash() { -- # Local FTL hash does not exist on filesystem -- if [[ "$1" == "FTL" ]]; then -- echo "N/A" -- return 0 -- fi -- -- # Get the short hash of the local repository -- local directory="${1}" -- local hash -- -- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; } -- hash=$(git rev-parse --short HEAD || echo "$DEFAULT") -- if [[ "${hash}" == "${DEFAULT}" ]]; then -- echo "ERROR" -- return 1 -- else -- echo "${hash}" -- fi -+ echo "N/A" - return 0 - } - - getRemoteHash(){ -- # Remote FTL hash is not applicable -- if [[ "$1" == "FTL" ]]; then -- echo "N/A" -- return 0 -- fi +- # Local FTL hash does not exist on filesystem +- if [[ "$1" == "FTL" ]]; then +- echo "N/A" +- return 0 +- fi - -- local daemon="${1}" -- local branch="${2}" +- # Get the short hash of the local repository +- local directory="${1}" +- local hash - -- hash=$(git ls-remote --heads "https://github.com/pi-hole/${daemon}" | \ -- awk -v bra="$branch" '$0~bra {print substr($0,0,8);exit}') -- if [[ -n "$hash" ]]; then -- echo "$hash" -- else -- echo "ERROR" -- return 1 -- fi -+ echo "N/A" - return 0 +- cd "${directory}" 2> /dev/null || { echo "${DEFAULT}"; return 1; } +- hash=$(git rev-parse --short HEAD || echo "$DEFAULT") +- if [[ "${hash}" == "${DEFAULT}" ]]; then +- echo "ERROR" +- return 1 +- else +- echo "${hash}" +- fi ++ echo "N/A" + return 0 } |