50 lines
1.3 KiB
Diff
50 lines
1.3 KiB
Diff
--- 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
|
|
-
|
|
- 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 "4.2.1"
|
|
else
|
|
- echo "Untagged"
|
|
+ echo "4.2.1"
|
|
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
|
|
}
|
|
|