CyberShadow / aconfmgr / 94

Build # 94

Build Type

push

github

Committed by GitHub

Commit Message

<a href="https://github.com/CyberShadow/aconfmgr/commit/<a class=hub.com/CyberShadow/aconfmgr/commit/<a class="double-link" href="https://git"><a class=hub.com/CyberShadow/aconfmgr/commit/<a class="double-link" href="https://git"><a class=hub.com/CyberShadow/aconfmgr/commit/c7a3dde81a367223d8091ac224d6a3b601dc5bad">c7a3dde81<a href="https://github.com/CyberShadow/aconfmgr/commit/c7a3dde81a367223d8091ac224d6a3b601dc5bad">&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/CyberShadow/aconfmgr/commit/&lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/CyberShadow/aconfmgr/commit/&amp;lt;a class=&amp;quot;double-link&amp;quot; href=&amp;quot;https://git&quot;&gt;&amp;lt;a class=&lt;/a&gt;hub.com/CyberShadow/aconfmgr/commit/c7a3dde81a367223d8091ac224d6a3b601dc5bad&quot;&gt;c7a3dde81&lt;/a&gt;&lt;a href=&quot;https://github.com/CyberShadow/aconfmgr/commit/c7a3dde81a367223d8091ac224d6a3b601dc5bad&quot;&gt;&amp;lt;a href=&amp;quot;https://github.com/CyberShadow/aconfmgr/commit/c7a3dde81a367223d8091ac224d6a3b6&lt;/a&gt;01dc5bad">&quot;&gt;Merge &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/CyberShadow/aconfmgr/commit/&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/CyberShadow/aconfmgr/commit/<a class="double-link" href="https://github.com/CyberShadow/aconfmgr/commit/4489e810ec1219ebc2ccbb7cdf3eebc200656971">4489e810e</a><a href="https://github.com/CyberShadow/aconfmgr/commit/c7a3dde81a367223d8091ac224d6a3b601dc5bad">&amp;quot;&amp;gt;4489e810e&amp;lt;/a&amp;gt;&amp;quot;&amp;gt;4489e810e&amp;lt;/a&amp;gt;&amp;lt;a href=&amp;quot;https://github.com/CyberShadow/aconfmgr/commit/c7a3dde81a367223d8091ac224d6a3b601dc5&lt;/a&gt;bad&quot;&gt; into &lt;/a&gt;&lt;a class=&quot;double-link&quot; href=&quot;https://github.com/CyberShadow/aconfmgr/commit/<a class="double-link" href="https://github.com/CyberShadow/aconfmgr/commit/ea7f084ec">ea7f084ec">ea7f084ec</a>

Run Details

33 of 45 new or added lines in 3 files covered. (73.33%)

3 existing lines in 1 file now uncovered.

4076 of 4388 relevant lines covered (92.89%)

404.02 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

98.59

/src/save.bash

# save.bash

# This file contains the implementation of aconfmgr's 'save' command.

function AconfSave() {
        local config_save_target=$config_dir/99-unsorted.sh
        local modified=n

        AconfCompile

        LogEnter 'Saving configuration...\n'

        #
        # Packages
        #

        LogEnter 'Examining packages...\n'

        # Unknown native packages (installed but not listed)

        local -a unknown_packages
        comm -13 <(PrintArray packages) <(PrintArray installed_packages) | mapfile -t unknown_packages

        if [[ ${#unknown_packages[@]} != 0 ]]
        then
                LogEnter 'Found %s unknown packages. Registering...\n' "$(Color G ${#unknown_packages[@]})"
                printf '\n\n# %s - Unknown packages\n\n\n' "$(date)" >> "$config_save_target"
                local package
                for package in "${unknown_packages[@]}"
                do
                        Log '%s...\r' "$(Color M "%q" "$package")"
                        local description
                        description="$(LC_ALL=C "$PACMAN" --query --info "$package" | grep '^Description' | cut -d ':' -f 2)"
                        printf 'AddPackage %q #%s\n' "$package" "$description" >> "$config_save_target"
                done
                modified=y
                LogLeave
        fi

        # Missing native packages (listed but not installed on current system)

        local -a missing_packages
        comm -23 <(PrintArray packages) <(PrintArray installed_packages) | mapfile -t missing_packages

        if [[ ${#missing_packages[@]} != 0 ]]
        then
                LogEnter 'Found %s missing packages. Un-registering.\n' "$(Color G ${#missing_packages[@]})"
                printf '\n\n# %s - Missing packages\n\n\n' "$(date)" >> "$config_save_target"
                local package
                for package in "${missing_packages[@]}"
                do
                        printf 'RemovePackage %q\n' "$package" >> "$config_save_target"
                done
                modified=y
                LogLeave
        fi

        # Unknown foreign packages (installed but not listed)

        local -a unknown_foreign_packages
        comm -13 <(PrintArray foreign_packages) <(PrintArray installed_foreign_packages) | mapfile -t unknown_foreign_packages

        if [[ ${#unknown_foreign_packages[@]} != 0 ]]
        then
                LogEnter 'Found %s unknown foreign packages. Registering...\n' "$(Color G ${#unknown_foreign_packages[@]})"
                printf '\n\n# %s - Unknown foreign packages\n\n\n' "$(date)" >> "$config_save_target"
                local package
                for package in "${unknown_foreign_packages[@]}"
                do
                        Log '%s...\r' "$(Color M "%q" "$package")"
                        local description
                        description="$(LC_ALL=C "$PACMAN" --query --info "$package" | grep '^Description' | cut -d ':' -f 2)"
                        printf 'AddPackage --foreign %q #%s\n' "$package" "$description" >> "$config_save_target"
                done
                modified=y
                LogLeave
        fi

        # Missing foreign packages (listed but not installed on current system)

        local -a missing_foreign_packages
        comm -23 <(PrintArray foreign_packages) <(PrintArray installed_foreign_packages) | mapfile -t missing_foreign_packages

        if [[ ${#missing_foreign_packages[@]} != 0 ]]
        then
                LogEnter 'Found %s missing foreign packages. Un-registering.\n' "$(Color G ${#missing_foreign_packages[@]})"
                printf '\n\n# %s - Missing foreign packages\n\n\n' "$(date)" >> "$config_save_target"
                local package
                for package in "${missing_foreign_packages[@]}"
                do
                        printf 'RemovePackage --foreign %q\n' "$package" >> "$config_save_target"
                done
                modified=y
                LogLeave
        fi

        LogLeave # Examining packages

        #
        # Emit files
        #

        LogEnter 'Registering files...\n'

        # Don't emit redundant CreateDir lines
        local -A skip_dirs
        local file
        ( Print0Array system_only_files ; Print0Array changed_files ) | \
                while read -r -d $'\0' file
                do
                        local path=${file%/*}
                        while [[ -n "$path" ]]
                        do
                                skip_dirs[$path]=y
                                path=${path%/*}
                        done
                done

        if [[ ${#config_only_files[@]} != 0 ]]
        then
                LogEnter 'Found %s extra files.\n' "$(Color G ${#config_only_files[@]})"
                printf '\n\n# %s - Extra files\n\n\n' "$(date)" >> "$config_save_target"
                local i
                for ((i=${#config_only_files[@]}-1; i>=0; i--))
                do
                        file=${config_only_files[$i]}
                        printf 'RemoveFile %q\n' "$file" >> "$config_save_target"
                done
                modified=y
                LogLeave
        fi

        if [[ ${#system_only_files[@]} != 0 || ${#changed_files[@]} != 0 ]]
        then
                LogEnter 'Found %s new and %s changed files.\n' "$(Color G ${#system_only_files[@]})" "$(Color G ${#changed_files[@]})"
                printf '\n\n# %s - New / changed files\n\n\n' "$(date)" >> "$config_save_target"
                ( Print0Array system_only_files ; Print0Array changed_files ) | \
                        while read -r -d $'\0' file
                        do
                                if [[ -n ${skip_dirs[$file]+x} ]]
                                then
                                        continue
                                fi

                                local dir
                                dir="$(dirname "$file")"
                                mkdir --parents "$config_dir"/files/"$dir"

                                local func args props suffix=''

                                local output_file="$output_dir"/files/"$file"
                                local system_file="$system_dir"/files/"$file"

                                local need_remove
                                if ! [[ -h "$output_file" || -e "$output_file" ]]
                                then
                                        need_remove=false # don't need RemoveFile if it doesn't exist
                                elif [[ -h "$output_file" || -h "$system_file" ]]
                                then
                                        need_remove=true # always need RemoveFile for symlinks
                                elif [[ ( -d "$output_file" && -d "$system_file" ) || ( -f "$output_file" && -f "$system_file" ) ]]
                                then
                                        need_remove=false # don't need RemoveFile if both are files or both are directories
                                else
                                        need_remove=true
                                fi

                                if $need_remove
                                then
                                        printf 'RemoveFile %q # Replacing %s with %s\n' "$file" \
                                                   "$(LC_ALL=C stat --format=%F "$output_file")" \
                                                   "$(LC_ALL=C stat --format=%F "$system_file")" \
                                                   >> "$config_save_target"
                                fi

                                if [[ -h "$system_file" ]]
                                then
                                        func=CreateLink
                                        args=("$file" "$(readlink "$system_file")")
                                        props=(owner group)
                                elif [[ -d "$system_file" ]]
                                then
                                        func=CreateDir
                                        args=("$file")
                                        props=(mode owner group)
                                else
                                        local size
                                        size=$(LC_ALL=C stat --format=%s "$system_file")
                                        if [[ $size -eq 0 ]]
                                        then
                                                func=CreateFile
                                                suffix=' > /dev/null'

                                                if [[ -h "$output_file" || -e "$output_file" ]]
                                                then
                                                        printf 'RemoveFile %q\n' "$file" >> "$config_save_target"
                                                fi
                                        else
                                                cp "$system_file" "$config_dir"/files/"$file"
                                                func=CopyFile
                                        fi
                                        args=("$file")
                                        props=(mode owner group)
                                fi

                                # Calculate the optional function parameters
                                local prop
                                for prop in "${props[@]}"
                                do
                                        local key="$file:$prop"
                                        if [[ -n "${system_file_props[$key]+x}" ]]
                                        then
                                                args+=("${system_file_props[$key]}")
                                                unset "output_file_props[\$key]"
                                                unset "system_file_props[\$key]"
                                        else
                                                args+=('')
                                        fi
                                done

                                # Trim redundant blank parameters
                                while [[ -z "${args[-1]}" ]]
                                do
                                        unset args[${#args[@]}-1]
                                done

                                printf '%s%s%s\n' "$func" "$(printf ' %q' "${args[@]}")" "$suffix" >> "$config_save_target"
                        done
                modified=y
                LogLeave
        fi

        LogLeave # Emit files

        #
        # Emit remaining file properties
        #

        LogEnter 'Registering file properties...\n'

        AconfCompareFileProps # Update data after above unsets

        if [[ ${#system_only_file_props[@]} != 0 || ${#changed_file_props[@]} != 0 ]]
        then
                printf '\n\n# %s - New file properties\n\n\n' "$(date)" >> "$config_save_target"
                local key
                ( ( Print0Array system_only_file_props ; Print0Array changed_file_props ) | sort --zero-terminated ) | \
                        while read -r -d $'\0' key
                        do
                                printf 'SetFileProperty %q %q %q\n' "${key%:*}" "${key##*:}" "${system_file_props[$key]}" >> "$config_save_target"
                        done
                modified=y
        fi

        if [[ ${#config_only_file_props[@]} != 0 ]]
        then
                printf '\n\n# %s - Extra file properties\n\n\n' "$(date)" >> "$config_save_target"
                local key
                ( Print0Array config_only_file_props | sort --zero-terminated ) | \
                        while read -r -d $'\0' key
                        do
                                printf 'SetFileProperty %q %q %q\n' "${key%:*}" "${key##*:}" '' >> "$config_save_target"
                        done
                modified=y
        fi

        LogLeave # Registering file properties

        if [[ $modified == n ]]
        then
                LogLeave 'Done (%s).\n' "$(Color G "configuration unchanged")"
        else
                LogLeave 'Done (%s).\n' "$(Color Y "configuration changed")"
        fi
}

: # include in coverage

1	# save.bash
2
3	# This file contains the implementation of aconfmgr's 'save' command.
4
5	function AconfSave() {
6	local config_save_target=$config_dir/99-unsorted.sh	54✔
7	local modified=n	54✔
8
9	AconfCompile	54✔
10
11	LogEnter 'Saving configuration...\n'	54✔
12
13	#
14	# Packages
15	#
16
17	LogEnter 'Examining packages...\n'	54✔
18
19	# Unknown native packages (installed but not listed)
20
21	local -a unknown_packages	54✔
22	comm -13 <(PrintArray packages) <(PrintArray installed_packages) \| mapfile -t unknown_packages	216✔
23
24	if [[ ${#unknown_packages[@]} != 0 ]]	54✔
25	then
26	LogEnter 'Found %s unknown packages. Registering...\n' "$(Color G ${#unknown_packages[@]})"	12✔
27	printf '\n\n# %s - Unknown packages\n\n\n' "$(date)" >> "$config_save_target"	12✔
28	local package	6✔
29	for package in "${unknown_packages[@]}"	12✔
30	do
31	Log '%s...\r' "$(Color M "%q" "$package")"	24✔
32	local description	12✔
33	description="$(LC_ALL=C "$PACMAN" --query --info "$package" \| grep '^Description' \| cut -d ':' -f 2)"	60✔
34	printf 'AddPackage %q #%s\n' "$package" "$description" >> "$config_save_target"	12✔
35	done
36	modified=y	6✔
37	LogLeave	6✔
38	fi
39
40	# Missing native packages (listed but not installed on current system)
41
42	local -a missing_packages	54✔
43	comm -23 <(PrintArray packages) <(PrintArray installed_packages) \| mapfile -t missing_packages	216✔
44
45	if [[ ${#missing_packages[@]} != 0 ]]	54✔
46	then
47	LogEnter 'Found %s missing packages. Un-registering.\n' "$(Color G ${#missing_packages[@]})"	8✔
48	printf '\n\n# %s - Missing packages\n\n\n' "$(date)" >> "$config_save_target"	8✔
49	local package	4✔
50	for package in "${missing_packages[@]}"	12✔
51	do
52	printf 'RemovePackage %q\n' "$package" >> "$config_save_target"	12✔
53	done
54	modified=y	4✔
55	LogLeave	4✔
56	fi
57
58	# Unknown foreign packages (installed but not listed)
59
60	local -a unknown_foreign_packages	54✔
61	comm -13 <(PrintArray foreign_packages) <(PrintArray installed_foreign_packages) \| mapfile -t unknown_foreign_packages	216✔
62
63	if [[ ${#unknown_foreign_packages[@]} != 0 ]]	54✔
64	then
65	LogEnter 'Found %s unknown foreign packages. Registering...\n' "$(Color G ${#unknown_foreign_packages[@]})"	6✔
66	printf '\n\n# %s - Unknown foreign packages\n\n\n' "$(date)" >> "$config_save_target"	6✔
67	local package	3✔
68	for package in "${unknown_foreign_packages[@]}"	6✔
69	do
70	Log '%s...\r' "$(Color M "%q" "$package")"	12✔
71	local description	6✔
72	description="$(LC_ALL=C "$PACMAN" --query --info "$package" \| grep '^Description' \| cut -d ':' -f 2)"	30✔
73	printf 'AddPackage --foreign %q #%s\n' "$package" "$description" >> "$config_save_target"	6✔
74	done
75	modified=y	3✔
76	LogLeave	3✔
77	fi
78
79	# Missing foreign packages (listed but not installed on current system)
80
81	local -a missing_foreign_packages	54✔
82	comm -23 <(PrintArray foreign_packages) <(PrintArray installed_foreign_packages) \| mapfile -t missing_foreign_packages	216✔
83
84	if [[ ${#missing_foreign_packages[@]} != 0 ]]	54✔
85	then
86	LogEnter 'Found %s missing foreign packages. Un-registering.\n' "$(Color G ${#missing_foreign_packages[@]})"	6✔
87	printf '\n\n# %s - Missing foreign packages\n\n\n' "$(date)" >> "$config_save_target"	6✔
88	local package	3✔
89	for package in "${missing_foreign_packages[@]}"	7✔
90	do
91	printf 'RemovePackage --foreign %q\n' "$package" >> "$config_save_target"	7✔
92	done
93	modified=y	3✔
94	LogLeave	3✔
95	fi
96
97	LogLeave # Examining packages	54✔
98
99	#
100	# Emit files
101	#
102
103	LogEnter 'Registering files...\n'	54✔
104
105	# Don't emit redundant CreateDir lines
106	local -A skip_dirs	54✔
107	local file	54✔
108	( Print0Array system_only_files ; Print0Array changed_files ) \| \	108✔
109	while read -r -d $'\0' file	92✔
110	do
111	local path=${file%/*}	38✔
112	while [[ -n "$path" ]]	52✔
113	do
114	skip_dirs[$path]=y	14✔
115	path=${path%/*}	14✔
116	done
117	done
118
119	if [[ ${#config_only_files[@]} != 0 ]]	54✔
120	then
121	LogEnter 'Found %s extra files.\n' "$(Color G ${#config_only_files[@]})"	12✔
122	printf '\n\n# %s - Extra files\n\n\n' "$(date)" >> "$config_save_target"	12✔
123	local i	6✔
124	for ((i=${#config_only_files[@]}-1; i>=0; i--))	28✔
125	do
126	file=${config_only_files[$i]}	8✔
127	printf 'RemoveFile %q\n' "$file" >> "$config_save_target"	8✔
128	done
129	modified=y	6✔
130	LogLeave	6✔
131	fi
132
133	if [[ ${#system_only_files[@]} != 0 \|\| ${#changed_files[@]} != 0 ]]	88✔
134	then
135	LogEnter 'Found %s new and %s changed files.\n' "$(Color G ${#system_only_files[@]})" "$(Color G ${#changed_files[@]})"	60✔
136	printf '\n\n# %s - New / changed files\n\n\n' "$(date)" >> "$config_save_target"	40✔
137	( Print0Array system_only_files ; Print0Array changed_files ) \| \	40✔
138	while read -r -d $'\0' file	58✔
139	do
140	if [[ -n ${skip_dirs[$file]+x} ]]	38✔
141	then
142	continue	2✔
143	fi
144
145	local dir	36✔
146	dir="$(dirname "$file")"	72✔
147	mkdir --parents "$config_dir"/files/"$dir"	36✔
148
149	local func args props suffix=''	36✔
150
151	local output_file="$output_dir"/files/"$file"	36✔
152	local system_file="$system_dir"/files/"$file"	36✔
153
154	local need_remove	36✔
155	if ! [[ -h "$output_file" \|\| -e "$output_file" ]]	66✔
156	then
157	need_remove=false # don't need RemoveFile if it doesn't exist	26✔
158	elif [[ -h "$output_file" \|\| -h "$system_file" ]]	14✔
159	then
160	need_remove=true # always need RemoveFile for symlinks	8✔
161	elif [[ ( -d "$output_file" && -d "$system_file" ) \|\| ( -f "$output_file" && -f "$system_file" ) ]]	6✔
162	then
163	need_remove=false # don't need RemoveFile if both are files or both are directories	×
164	else
165	need_remove=true	2✔
166	fi
167
168	if $need_remove	36✔
169	then
170	printf 'RemoveFile %q # Replacing %s with %s\n' "$file" \	50✔
171	"$(LC_ALL=C stat --format=%F "$output_file")" \	50✔
172	"$(LC_ALL=C stat --format=%F "$system_file")" \	50✔
173	>> "$config_save_target"	50✔
174	fi
175
176	if [[ -h "$system_file" ]]	36✔
177	then
178	func=CreateLink	8✔
179	args=("$file" "$(readlink "$system_file")")	16✔
180	props=(owner group)	8✔
181	elif [[ -d "$system_file" ]]	28✔
182	then
183	func=CreateDir	4✔
184	args=("$file")	4✔
185	props=(mode owner group)	4✔
186	else
187	local size	24✔
188	size=$(LC_ALL=C stat --format=%s "$system_file")	72✔
189	if [[ $size -eq 0 ]]	24✔
190	then
191	func=CreateFile	2✔
192	suffix=' > /dev/null'	2✔
193
194	if [[ -h "$output_file" \|\| -e "$output_file" ]]	4✔
195	then
NEW 196	printf 'RemoveFile %q\n' "$file" >> "$config_save_target"	×
197	fi
198	else
199	cp "$system_file" "$config_dir"/files/"$file"	22✔
200	func=CopyFile	22✔
201	fi
202	args=("$file")	24✔
203	props=(mode owner group)	24✔
204	fi
205
206	# Calculate the optional function parameters
207	local prop	36✔
208	for prop in "${props[@]}"	100✔
209	do
210	local key="$file:$prop"	100✔
211	if [[ -n "${system_file_props[$key]+x}" ]]	100✔
212	then
213	args+=("${system_file_props[$key]}")	28✔
214	unset "output_file_props[\$key]"	28✔
215	unset "system_file_props[\$key]"	28✔
216	else
217	args+=('')	72✔
218	fi
219	done
220
221	# Trim redundant blank parameters
222	while [[ -z "${args[-1]}" ]]	108✔
223	do
224	unset args[${#args[@]}-1]	72✔
225	done
226
227	printf '%s%s%s\n' "$func" "$(printf ' %q' "${args[@]}")" "$suffix" >> "$config_save_target"	72✔
228	done
229	modified=y	20✔
230	LogLeave	20✔
231	fi
232
233	LogLeave # Emit files	54✔
234
235	#
236	# Emit remaining file properties
237	#
238
239	LogEnter 'Registering file properties...\n'	54✔
240
241	AconfCompareFileProps # Update data after above unsets	54✔
242
243	if [[ ${#system_only_file_props[@]} != 0 \|\| ${#changed_file_props[@]} != 0 ]]	105✔
244	then
245	printf '\n\n# %s - New file properties\n\n\n' "$(date)" >> "$config_save_target"	6✔
246	local key	3✔
247	( ( Print0Array system_only_file_props ; Print0Array changed_file_props ) \| sort --zero-terminated ) \| \	9✔
248	while read -r -d $'\0' key	10✔
249	do
250	printf 'SetFileProperty %q %q %q\n' "${key%:}" "${key##:}" "${system_file_props[$key]}" >> "$config_save_target"	7✔
251	done
252	modified=y	3✔
253	fi
254
255	if [[ ${#config_only_file_props[@]} != 0 ]]	54✔
256	then
257	printf '\n\n# %s - Extra file properties\n\n\n' "$(date)" >> "$config_save_target"	8✔
258	local key	4✔
259	( Print0Array config_only_file_props \| sort --zero-terminated ) \| \	8✔
260	while read -r -d $'\0' key	16✔
261	do
262	printf 'SetFileProperty %q %q %q\n' "${key%:}" "${key##:}" '' >> "$config_save_target"	12✔
263	done
264	modified=y	4✔
265	fi
266
267	LogLeave # Registering file properties	54✔
268
269	if [[ $modified == n ]]	54✔
270	then
271	LogLeave 'Done (%s).\n' "$(Color G "configuration unchanged")"	40✔
272	else
273	LogLeave 'Done (%s).\n' "$(Color Y "configuration changed")"	68✔
274	fi
275	}
276
277	: # include in coverage	170✔

CyberShadow / aconfmgr / 94

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous