misc fixes and diff now shows when filelist/cryptlist is the only change (fix #10)

Author: kobus-v-schoor

bin/dotgit

@@ -39,13 +39,13 @@ declare -a FE # File encrypt flag
 
 [[ $DG_VERBOSE -eq 0 ]] && shift
 
-init_cgroups
+[[ $# -ne 0 ]] && [[ $1 != "init" ]] && [[ $1 != "help" ]] && init_cgroups
 
 declare -a tctg
-if [[ $# == 0 ]]; then
+if [[ $# -eq 0 ]]; then
 	phelp
 	exit
-elif [[ $# == 1 ]]; then
+elif [[ $# -eq 1 ]]; then
 	tctg=(common $HOSTNAME)
 else
 	tctg=(${@:2})

bin/dotgit_headers/diff

@@ -9,6 +9,10 @@ function init_diff
 	cd "$REPO"
 	git add --all
 	IFS=$'\n'
+
+	local fl_ch=0
+	local cr_ch=0
+
 	while read -r line; do
 		local a=${line%% *}
 		local f=${line#* }
@@ -17,6 +21,8 @@ function init_diff
 		f=${f%\"}
 		f=${f#\"}
 
+		[[ $f == "$FILELIST" ]] && fl_ch=1 && continue
+		[[ $f == "$CRYPTLIST" ]] && cr_ch=1 && continue
 		[[ ! $f =~ ^$DG_DFDIR* ]] && continue
 		[[ $f =~ .*\.hash ]] && continue
 
@@ -33,6 +39,11 @@ function init_diff
 	done <<< "$(git status --porcelain)"
 	unset line
 
+	if [[ ${#DG_DIFF_F[@]} -eq 0 ]]; then
+		[[ $fl_ch -ne 0 ]] && DG_DIFF_F+=("filelist") && DG_DIFF_T+=("modified")
+		[[ $cr_ch -ne 0 ]] && DG_DIFF_F+=("cryptlist") && DG_DIFF_T+=("modified")
+	fi
+
 	git reset -q
 }
 

bin/dotgit_headers/repo

@@ -118,7 +118,7 @@ function init_flists
 
 			local -a arr
 			IFS=$',' arr=(${l[1]:-"common"})
-			IFS=$'\n' arr=($(sort<<<"${arr[*]}"))
+			IFS=$'\n' arr=($(sort -u<<<"${arr[*]}"))
 
 			# If file entry is folder inside repo and home folder has no such
 			# file, folder or the folder is empty - then use repo contents as
@@ -139,11 +139,13 @@ function init_flists
 				FE+=($n)
 				verecho "$(levecho 1 "Added ${l[0]} - ${arr[*]} - $n")"
 			else
+				IFS=$','
 				verecho "$(levecho 1 \
 					"Using directory mode for ${l[0]} - ${arr[*]} - $n")"
 
 				IFS=$'\n'
 				while read -r fls; do
+					[[ ! $fls ]] && continue
 					[[ $PRE ]] && fls=${fls#$PRE}
 					FN+=("$fls")
 					IFS=$',' FC+=("${arr[*]}")