mirror of
https://github.com/pi-hole/pi-hole.git
synced 2024-12-24 13:50:17 +00:00
Merge pull request #1667 from pi-hole/install-space
Remove erroneous space
This commit is contained in:
commit
1ae403b742
2 changed files with 9 additions and 5 deletions
|
@ -171,7 +171,11 @@ checkout_pull_branch() {
|
||||||
|
|
||||||
oldbranch="$(git symbolic-ref HEAD)"
|
oldbranch="$(git symbolic-ref HEAD)"
|
||||||
|
|
||||||
|
str="Switching to branch: '${branch}' from '${oldbranch}'"
|
||||||
|
echo -ne " ${INFO} $str"
|
||||||
git checkout "${branch}" --quiet || return 1
|
git checkout "${branch}" --quiet || return 1
|
||||||
|
echo -e "${OVER} ${TICK} $str"
|
||||||
|
|
||||||
|
|
||||||
if [[ "$(git diff "${oldbranch}" | grep -c "^")" -gt "0" ]]; then
|
if [[ "$(git diff "${oldbranch}" | grep -c "^")" -gt "0" ]]; then
|
||||||
update="true"
|
update="true"
|
||||||
|
@ -180,7 +184,7 @@ checkout_pull_branch() {
|
||||||
git_pull=$(git pull || return 1)
|
git_pull=$(git pull || return 1)
|
||||||
|
|
||||||
if [[ "$git_pull" == *"up-to-date"* ]]; then
|
if [[ "$git_pull" == *"up-to-date"* ]]; then
|
||||||
echo -e " ${INFO} $(git pull)"
|
echo -e " ${INFO} ${git_pull}"
|
||||||
else
|
else
|
||||||
echo -e "$git_pull\\n"
|
echo -e "$git_pull\\n"
|
||||||
fi
|
fi
|
||||||
|
@ -271,7 +275,7 @@ checkout() {
|
||||||
str="Fetching branches from ${piholeGitUrl}"
|
str="Fetching branches from ${piholeGitUrl}"
|
||||||
echo -ne " ${INFO} $str"
|
echo -ne " ${INFO} $str"
|
||||||
if ! fully_fetch_repo "${PI_HOLE_FILES_DIR}" ; then
|
if ! fully_fetch_repo "${PI_HOLE_FILES_DIR}" ; then
|
||||||
echo -e " ${CROSS} $str"
|
echo -e "${OVER} ${CROSS} $str"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
corebranches=($(get_available_branches "${PI_HOLE_FILES_DIR}"))
|
corebranches=($(get_available_branches "${PI_HOLE_FILES_DIR}"))
|
||||||
|
@ -298,7 +302,7 @@ checkout() {
|
||||||
str="Fetching branches from ${webInterfaceGitUrl}"
|
str="Fetching branches from ${webInterfaceGitUrl}"
|
||||||
echo -ne " ${INFO} $str"
|
echo -ne " ${INFO} $str"
|
||||||
if ! fully_fetch_repo "${webInterfaceDir}" ; then
|
if ! fully_fetch_repo "${webInterfaceDir}" ; then
|
||||||
echo -e " ${CROSS} $str"
|
echo -e "${OVER} ${CROSS} $str"
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
webbranches=($(get_available_branches "${webInterfaceDir}"))
|
webbranches=($(get_available_branches "${webInterfaceDir}"))
|
||||||
|
|
|
@ -1216,7 +1216,7 @@ install_dependent_packages() {
|
||||||
if command -v debconf-apt-progress &> /dev/null; then
|
if command -v debconf-apt-progress &> /dev/null; then
|
||||||
# For each package,
|
# For each package,
|
||||||
for i in "${argArray1[@]}"; do
|
for i in "${argArray1[@]}"; do
|
||||||
echo -ne " ${INFO} Checking for $i..."
|
echo -ne " ${INFO} Checking for $i..."
|
||||||
#
|
#
|
||||||
if dpkg-query -W -f='${Status}' "${i}" 2>/dev/null | grep "ok installed" &> /dev/null; then
|
if dpkg-query -W -f='${Status}' "${i}" 2>/dev/null | grep "ok installed" &> /dev/null; then
|
||||||
#
|
#
|
||||||
|
@ -1243,7 +1243,7 @@ install_dependent_packages() {
|
||||||
|
|
||||||
# Install Fedora/CentOS packages
|
# Install Fedora/CentOS packages
|
||||||
for i in "${argArray1[@]}"; do
|
for i in "${argArray1[@]}"; do
|
||||||
echo -ne " ${INFO} Checking for $i..."
|
echo -ne " ${INFO} Checking for $i..."
|
||||||
#
|
#
|
||||||
if ${PKG_MANAGER} -q list installed "${i}" &> /dev/null; then
|
if ${PKG_MANAGER} -q list installed "${i}" &> /dev/null; then
|
||||||
echo -e "${OVER} ${TICK} Checking for $i"
|
echo -e "${OVER} ${TICK} Checking for $i"
|
||||||
|
|
Loading…
Reference in a new issue