arno/pi-hole
1
0
Fork 0
mirror of https://github.com/pi-hole/pi-hole synced 2024-12-22 23:08:07 +00:00
Code Issues Releases Wiki Activity

ShellCheck

Browse Source
This commit is contained in:
DL6ER 2017-07-05 19:34:20 +02:00
parent 70fd94edb3
commit bb8a263d70
No known key found for this signature in database
GPG Key ID: 00135ACBD90B28DD
1 changed files with 24 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
advanced/Scripts/piholeCheckout.sh
View File

@ -35,16 +35,19 @@ check_download_exists() {
FTLinstall() { FTLinstall() {
# Download and install FTL binary # Download and install FTL binary
local binary="${1}" local binary
local path="${2}" binary="${1}"
local str="Installing FTL" local path
path="${2}"
local str
str="Installing FTL"
echo -ne " ${INFO} ${str}..." echo -ne " ${INFO} ${str}..."
if curl -sSL --fail "https://ftl.pi-hole.net/${path}" -o "/tmp/${binary}"; then if curl -sSL --fail "https://ftl.pi-hole.net/${path}" -o "/tmp/${binary}"; then
# Get sha1 of the binary we just downloaded for verification. # Get sha1 of the binary we just downloaded for verification.
curl -sSL --fail "https://ftl.pi-hole.net/${path}.sha1" -o "/tmp/${binary}.sha1" curl -sSL --fail "https://ftl.pi-hole.net/${path}.sha1" -o "/tmp/${binary}.sha1"
# Check if we just downloaded text, or a binary file. # Check if we just downloaded text, or a binary file.
cd /tmp cd /tmp || return 1
if sha1sum --status --quiet -c "${binary}".sha1; then if sha1sum --status --quiet -c "${binary}".sha1; then
echo -n "transferred... " echo -n "transferred... "
stop_service pihole-FTL &> /dev/null stop_service pihole-FTL &> /dev/null
@ -66,15 +69,17 @@ FTLinstall() {
get_binary_name() { get_binary_name() {
local machine local machine
machine=$(uname -m) machine=$(uname -m)
local str="Detecting architecture" local str
str="Detecting architecture"
echo -ne " ${INFO} ${str}..." echo -ne " ${INFO} ${str}..."
if [[ ${machine} == arm* || ${machine} == *aarch* ]]; then if [[ ${machine} == arm* || ${machine} == *aarch* ]]; then
# ARM # ARM
local rev=$(uname -m | sed "s/[^0-9]//g;") local rev
local lib=$(ldd /bin/ls | grep -E '^\s*/lib' | awk '{ print $1 }') rev=$(uname -m | sed "s/[^0-9]//g;")
local lib
lib=$(ldd /bin/ls | grep -E '^\s*/lib' | awk '{ print $1 }')
if [[ "$lib" == "/lib/ld-linux-aarch64.so.1" ]]; then if [[ "$lib" == "/lib/ld-linux-aarch64.so.1" ]]; then
echo -e "${OVER} ${TICK} Detected ARM-aarch64 architecture" echo -e "${OVER} ${TICK} Detected ARM-aarch64 architecture"
binary="pihole-FTL-aarch64-linux-gnu" binary="pihole-FTL-aarch64-linux-gnu"
@ -127,7 +132,8 @@ fully_fetch_repo() {
get_available_branches() { get_available_branches() {
# Return available branches # Return available branches
local directory="${1}" local directory
directory="${1}"
local output local output
cd "${directory}" || return 1 cd "${directory}" || return 1
@ -139,11 +145,13 @@ get_available_branches() {
fetch_checkout_pull_branch() { fetch_checkout_pull_branch() {
# Check out specified branch # Check out specified branch
local directory="${1}" local directory
local branch="${2}" directory="${1}"
local branch
branch="${2}"
# Set the reference for the requested branch, fetch, check it put and pull it # Set the reference for the requested branch, fetch, check it put and pull it
cd "${directory}" cd "${directory}" || return 1
git remote set-branches origin "${branch}" || return 1 git remote set-branches origin "${branch}" || return 1
git stash --all --quiet &> /dev/null || true git stash --all --quiet &> /dev/null || true
git clean --force -d || true git clean --force -d || true
@ -153,8 +161,10 @@ fetch_checkout_pull_branch() {
checkout_pull_branch() { checkout_pull_branch() {
# Check out specified branch # Check out specified branch
local directory="${1}" local directory
local branch="${2}" directory="${1}"
local branch
branch="${2}"
local oldbranch local oldbranch
cd "${directory}" || return 1 cd "${directory}" || return 1