Small bugs and cosmetic issues (#3776)

* Remove debug code

* Replace duplicate query

* Oh-my-zsh configuration has been changed. Adjusting our modifications

* Address changes to git client in a better way

compile.sh

@@ -30,7 +30,9 @@ fi
 if [[ -f "${SRC}"/lib/general.sh ]]; then
 
 	# Declare this folder as safe
-	git config --global --add safe.directory "${SRC}"
+	if [[ -z $(cat ${HOME}/.gitconfig | grep "directory = \*") ]]; then
+		git config --global --add safe.directory "*"
+	fi
 
 	# shellcheck source=lib/general.sh
 	source "${SRC}"/lib/general.sh

lib/compilation.sh

@@ -698,11 +698,8 @@ compile_armbian-zsh()
 	# define theme
 	sed -i 's/^ZSH_THEME=.*/ZSH_THEME="mrtazz"/' "${tmp_dir}/${armbian_zsh_dir}"/etc/skel/.zshrc
 
-	# disable prompt while update
-	sed -i 's/# DISABLE_UPDATE_PROMPT="true"/DISABLE_UPDATE_PROMPT="true"/g' "${tmp_dir}/${armbian_zsh_dir}"/etc/skel/.zshrc
-
 	# disable auto update since we provide update via package
-	sed -i 's/# DISABLE_AUTO_UPDATE="true"/DISABLE_AUTO_UPDATE="true"/g' "${tmp_dir}/${armbian_zsh_dir}"/etc/skel/.zshrc
+	sed -i "s/^# zstyle ':omz:update' mode disabled.*/zstyle ':omz:update' mode disabled/g" "${tmp_dir}/${armbian_zsh_dir}"/etc/skel/.zshrc
 
 	# define default plugins
 	sed -i 's/^plugins=.*/plugins=(evalcache git git-extras debian tmux screen history extract colorize web-search docker)/' "${tmp_dir}/${armbian_zsh_dir}"/etc/skel/.zshrc

lib/general.sh

@@ -484,9 +484,6 @@ fetch_from_repo()
 		local workdir=$dir
 	fi
 
-	# Declare folders we use as safe
-	git config --global --add safe.directory "${SRC}/cache/sources/$workdir"
-
 	mkdir -p "${SRC}/cache/sources/${workdir}" 2>/dev/null || \
 		exit_with_error "No path or no write permission" "${SRC}/cache/sources/${workdir}"
 
@@ -663,7 +660,7 @@ fingerprint_image()
 	Title:			${VENDOR} $REVISION ${BOARD^} $BRANCH
 	Kernel:			Linux $VER
 	Build date:		$(date +'%d.%m.%Y')
-	Builder rev:	$(git rev-parse HEAD)
+	Builder rev:		$BUILD_REPOSITORY_COMMIT
 	Maintainer:		$MAINTAINER <$MAINTAINERMAIL>
 	Authors:		https://www.armbian.com/authors
 	Sources: 		https://github.com/armbian/

lib/main.sh

@@ -316,7 +316,6 @@ if [[ $KERNEL_ONLY != yes && -z $RELEASE ]]; then
 
 	RELEASE=$(dialog --stdout --title "Choose a release package base" --backtitle "$backtitle" \
 	--menu "Select the target OS release package base" $TTY_Y $TTY_X $((TTY_Y - 8)) "${options[@]}")
-	echo "options : ${options}"
 	[[ -z $RELEASE ]] && exit_with_error "No release selected"
 
 	unset options