Merge fb9722a into 802b78e

CyberShadow · Dec 23, 2021 · e634e15 · e634e15
2 parents 802b78e + fb9722a
commit e634e15
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/src/save.bash b/src/save.bash
@@ -30,7 +30,7 @@ function AconfSave() {
 		do
 			Log '%s...\r' "$(Color M "%q" "$package")"
 			local description
-			description="$(LC_ALL=C "$PACMAN" --query --info "$package" | grep '^Description' | cut -d ':' -f 2)"
+			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
@@ -69,7 +69,7 @@ function AconfSave() {
 		do
 			Log '%s...\r' "$(Color M "%q" "$package")"
 			local description
-			description="$(LC_ALL=C "$PACMAN" --query --info "$package" | grep '^Description' | cut -d ':' -f 2)"
+			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

diff --git a/test/t/lib-funcs-integ.bash b/test/t/lib-funcs-integ.bash
@@ -14,7 +14,7 @@ function TestInit() {
 	yay_opts+=(--noconfirm)
 	paru_opts+=(--noconfirm)
 
-	# pacaur insists that this is set, even if it will never inoke it
+	# pacaur insists that this is set, even if it will never invoke it
 	export EDITOR=/bin/cat
 
 	# Allows AUR helpers find perl tools etc.

diff --git a/test/t/mocks/pacman b/test/t/mocks/pacman
@@ -138,7 +138,7 @@ function pacman() {
 					for package in "${args[@]}"
 					do
 						printf 'Name            : %s\n' "$package"
-						printf 'Description     : %s\n' 'Dummy aconfmgr test suite package'
+						printf 'Description     : %s\n' 'Dummy aconfmgr test suite package: subtitle'
 						printf 'Version         : %s\n' '1.0'
 						printf 'Architecture    : %s\n' 'x86_64'
 						printf '\n'

diff --git a/test/t/t-1_save-1_packages-1_new.sh b/test/t/t-1_save-1_packages-1_new.sh
@@ -14,8 +14,8 @@ AconfSave
 
 TestPhase_Check ###############################################################
 TestExpectConfig <<EOF
-AddPackage test-native-explicit-package # Dummy aconfmgr test suite package
-AddPackage --foreign test-foreign-explicit-package # Dummy aconfmgr test suite package
+AddPackage test-native-explicit-package # Dummy aconfmgr test suite package: subtitle
+AddPackage --foreign test-foreign-explicit-package # Dummy aconfmgr test suite package: subtitle
 EOF
 
 TestDone ######################################################################