fix(pkgctl): skip path arguments that are not directories

Several subcommands accept multiple paths in a way that passing a
wildcard is an expected use case. Previously this wasn't possible if the
main directory contained any text files or scripts.
Fix this by skipping none directory paths for such commands.

Component: pkgctl
Signed-off-by: Morten Linderud <foxboron@archlinux.org>

2 files changed, 15 insertions, 5 deletions

diff --git a/src/lib/repo/configure.sh b/src/lib/repo/configure.sh
index b3c188c..0980fd1 100644
--- a/src/lib/repo/configure.sh
+++ b/src/lib/repo/configure.sh
@@ -207,9 +207,14 @@ pkgctl_repo_configure() {
 	fi
 
 	for path in "${paths[@]}"; do
-		if ! realpath=$(realpath -e "${path}"); then
+		# resolve symlink for basename
+		if ! realpath=$(realpath --canonicalize-existing -- "${path}"); then
 			die "No such directory: ${path}"
 		fi
+		# skip paths that aren't directories
+		if [[ ! -d "${realpath}" ]]; then
+			continue
+		fi
 
 		pkgbase=$(basename "${realpath}")
 		pkgbase=${pkgbase%.git}
diff --git a/src/lib/repo/switch.sh b/src/lib/repo/switch.sh
index f411ac2..d8ba9df 100644
--- a/src/lib/repo/switch.sh
+++ b/src/lib/repo/switch.sh
@@ -101,16 +101,21 @@ pkgctl_repo_switch() {
 	fi
 
 	for path in "${paths[@]}"; do
-		if ! realpath=$(realpath -e -- "${path}"); then
+		# resolve symlink for basename
+		if ! realpath=$(realpath --canonicalize-existing -- "${path}"); then
 			die "No such directory: ${path}"
 		fi
-		pkgbase=$(basename "${realpath}")
-
-		if [[ ! -d "${path}/.git" ]]; then
+		# skip paths that are not directories
+		if [[ ! -d "${realpath}" ]]; then
+			continue
+		fi
+		# skip paths that are not git repositories
+		if [[ ! -d "${realpath}/.git" ]]; then
 			error "Not a Git repository: ${path}"
 			continue
 		fi
 
+		pkgbase=$(basename "${realpath}")
 		if ! git -C "${path}" checkout "${GIT_CHECKOUT_OPTIONS[@]}" "${GIT_REF}"; then
 			die "Failed to switch ${pkgbase} to version ${VERSION}"
 		fi