ugh

+ a bugfix.

README.md

@@ -1,17 +1,16 @@
-zpac
-----
+prm
+---
 A very simple AUR/ABS helper. Doesn't build packages, only gets the sources.
 
-	$ zpac -h
-	Usage: zpac [flags] <package>
-	Flags:
-	        -h        Show this message.
-	        -s        Search for <package>.
-		      -S      Search only in the sync db. Implies -s.
-			  -A      Search only in AUR. Implies -s.
-	        -d        Get the package sources (default).
-		      -D      Get the dependencies also. Implies -d.
-
-You can override any value in the script in \$HOME/.config/zpac.rc.sh
-By default zpac downloads the sources into the current directory. Controlled by `$cfg_workdir`.
+Usage: prm [flags] <package>
+Flags:
+        -h        Show this message.
+        -s        Search for <package>.
+          -S        Search only in the sync db. Implies -s.
+          -A        Search only in AUR. Implies -s.
+        -d        Get the package sources (default). Set twice to also get the dependencies.
+          -f        Force downloading package sources even if they are already present in the working directory.
+        -w <dir>  Set the working directory.
 
+You can override any value in the script in \$HOME/.config/prm.rc.sh
+By default prm downloads the sources into the current directory. Controlled by `$cfg_workdir`.

prm

@@ -9,71 +9,88 @@ cfg_workdir="$PWD"
 cfg_aur_url='https://aur.archlinux.org'
 cfg_aur_api="${cfg_aur_url}/rpc.php"
 
-echo() { printf '%s\n' "$*"; }
-err() { echo "$*" >&2; }
+err() { printf "$@" >&2; }
+
+_cat() { while read -r; do printf '%s\n' "$REPLY"; done }
 
 usage() {
-	while read; do echo "$REPLY"; done <<- EOF
+	_cat <<- EOF
 		Usage: $_self [flags] <package>
 		Flags:
 		        -h        Show this message.
 		        -s        Search for <package>.
 		          -S        Search only in the sync db. Implies -s.
 		          -A        Search only in AUR. Implies -s.
-		        -d        Get the package sources (default).
-				            Set twice to also get the dependencies.
+		        -d        Get the package sources (default). Set twice to also get the dependencies.
+		          -f        Force downloading package sources even if they are already present in the working directory.
+		        -w <dir>  Set the working directory.
 	EOF
 }
 
 aur.search() {
-	local aur_api_search_data aur_search_result_num pkg
+	declare i aur_api_search_data aur_search_result_num aur_search_results version description
 
 	aur_api_search_data=$( curl -skL "${cfg_aur_api}?type=search&arg=${1}" )
 	aur_search_result_num=$( jshon -e resultcount -u <<< "$aur_api_search_data" )
 
-	if (( aur_search_result_num )); then
-		aur_search_results=( $( jshon -e results -a -e Name -u <<< "$aur_api_search_data" ) )
+	# Exit if nothing was found
+	(( aur_search_result_num )) || { return 1; }
 
-		for i in "${!aur_search_results[@]}"; do
-			printf 'aur/%s\n    %s\n' "${aur_search_results[${i}]}" "$( jshon -e results -e $i -e Description -u <<< "$aur_api_search_data" )"
-		done
-	else
-		return 1
-	fi
+	aur_search_results=( $( jshon -e results -a -e Name -u <<< "$aur_api_search_data" ) )
+
+	for i in "${!aur_search_results[@]}"; do
+		{
+			read -r version
+			read -r description
+		} < <(
+			jshon -e results -e $i -e Version -u -p -e Description -u <<< "$aur_api_search_data"
+		)
+
+		printf '%s %s\n    %s\n' "aur/${aur_search_results[$i]}" "$version" "$description"
+	done
 }
 
 aur.info() {
-	local pkg_aur_info=$( curl -skL "${cfg_aur_api}?type=info&arg=${1}" 2>/dev/null )
-	local aur_query_result=$( jshon -e resultcount -u <<< "$pkg_aur_info" )
+	declare pkg_aur_info aur_query_result
+	
+	pkg_aur_info=$( curl -skL "${cfg_aur_api}?type=info&arg=${1}" 2>/dev/null )
+	aur_query_result=$( jshon -e resultcount -u <<< "$pkg_aur_info" )
 
-	if (( aur_query_result )); then
-		echo "$pkg_aur_info"
-	else
-		return 1
-	fi
+	(( aur_query_result )) || { return 1; }
+
+	printf '%s' "$pkg_aur_info"
 }
 
 aur.get() {
-	local dep_name aur_api_multireq aur_deps_api_data aur_deps_count aur_deps pkg_aur_info pkg_base tarball_path
+	declare i pkg_aur_info pkg_base tarball_path depends makedepends dep_name aur_api_multireq dep_name aur_deps_api_data aur_deps_count aur_deps
 	
-	read pkg_aur_info
+	read -r pkg_aur_info
 
-	pkg_base=$( jshon -e results -e PackageBase -u <<< "$pkg_aur_info" )
-	tarball_path=$( jshon -e results -e URLPath -u <<< "$pkg_aur_info" )
+	{
+		read -r pkg_base
+		read -r tarball_path
+	} < <(
+		jshon -e results -e PackageBase -u -p -e URLPath -u <<< "$pkg_aur_info"
+	)
+
+	(( flag_force )) || {
+		[[ -d "${cfg_workdir}/${pkg_base}" ]] && {
+			printf "Found %s in %s, skipping. Use -f to override\n" "${pkg_base}" "${cfg_workdir}"
+			return 17
+		}
+	}
 
 	cd "$cfg_workdir"
 
-	echo "Downloading ${cfg_aur_url}${tarball_path}"
+	printf "Working in %s\n" "${cfg_workdir}"
+
+	printf "Downloading %s\n" "${pkg_base}"
 	{ curl -skL "${cfg_aur_url}${tarball_path}" | gzip -d | tar x; } || {
-		err "Fail!"
+		err "Fail!\n"
 		return 1
 	}
 
-	echo ": ${cfg_workdir}/${pkg_base}"
-
 	if (( flag_get_deps )); then
-		unset depends makedepends
-
 		cd "${cfg_workdir}/${pkg_base}"
 		source PKGBUILD
 
@@ -86,11 +103,16 @@ aur.get() {
 		aur_deps_count=$( jshon -e resultcount <<< "$aur_deps_api_data" )
 
 		if (( aur_deps_count )); then
+			printf "Getting dependencies for %s\n" "${pkg_base}"
+
 			aur_deps=( $( jshon -e results -a -e Name -u <<< "$aur_deps_api_data" ) )
 
 			for i in "${aur_deps[@]}"; do
-				aur.get < <(aur.info "$i") || {
-					return "$?"
+				aur.get < <(aur.info "$i")
+				_result="$?"
+
+				(( _result > 0 && result != 17 )) && {
+					return "$_result"
 				}
 			done
 		fi
@@ -98,7 +120,7 @@ aur.get() {
 }
 
 abs.get() {
-	local pkg_repo svn_repo
+	declare pkg_repo svn_repo
 
 	pkg_repo="$2"
 
@@ -112,51 +134,50 @@ abs.get() {
 	svn checkout "svn://svn.archlinux.org/${svn_repo}/${1}/trunk" "${cfg_workdir}/${1}"
 }
 
-args_norm() {
+set_argv() {
+	declare arg opt c
+	declare -g argv
+
 	while (( $# )); do
-		unset -v arg opt c keys
+		unset -v arg opt c
 
 		case "$1" in
-			--) printf '%s\n' '--'; break;;
+			(--) argv+=( "$1" ); break;;
 
-			--*)
+			(--*)
 				IFS='=' read arg opt <<< "$1"
-				printf '%s\n' "$arg"
+				argv+=( "$arg" )
 
 				[[ "$opt" ]] && {
-					printf '%s\n' "$opt"
+					argv+=( "$opt" )
 				}
 			;;
 
-			-*)
+			(-*)
 				while read -n1 c
 				do
 					case "$c" in
 						-|'') :;;
-						*) keys+=( "-$c" );;
+						*) argv+=( "-$c" );;
 					esac
 				done <<< "$1"
-
-				printf '%s\n' "${keys[@]}"
 			;;
+
+			(*) argv+=( "$1" );;
 		esac
-		
-		[[ "$2" && ! "$2" =~ ^- ]] && {
-			printf '%s\n' "$2"
-			shift
-		}
-		
 		shift
 	done
 }
 
 main() {
-	if [[ -f "$HOME/.config/zpac.rc.sh" ]]; then
-		source "$HOME/.config/zpac.rc.sh"
+	if [[ -f "$HOME/.config/prm.rc.sh" ]]; then
+		source "$HOME/.config/prm.rc.sh"
 	fi
 
 	while (( $# )); do
 		case "$1" in
+			(--) shift; break;;
+
 			(-h) usage; return 0;;
 
 			(-s) action='search';;
@@ -175,14 +196,19 @@ main() {
 				fi
 			;;
 
-			(--) shift; break;;
+			(-w) 
+				cfg_workdir="$2"
+				shift;;
+
+			(-f) flag_force=1;;
+
 			(-*)
-				err "Unknown key: $1"
+				err "Unknown key: %s\n" "$1"
 				usage
 				return 1
 			;;
 
-			*) break;;
+			(*) break;;
 		esac
 		shift
 	done
@@ -207,7 +233,7 @@ main() {
 		(get)
 			[[ -d "$cfg_workdir" ]] || {
 				mkdir -p "$cfg_workdir" || {
-					err "Can't create workdir: ${cfg_workdir}."
+					err "Can't create workdir: %s\n" "$cfg_workdir"
 					return 1
 				}
 			}
@@ -217,19 +243,19 @@ main() {
 			if (( ! "$?" )); then
 				repo='aur'
 			else
-				while read; do
+				while read -r; do
 					if [[ "$REPLY" =~ ^Repository ]]; then
 						repo="${REPLY##* }"
 					fi
 				done < <( pacman -Si "$package" )
 
 				[[ "$repo" ]] || {
-					err "Can't find package ${package}"
+					err "Can't find package %s\n" "$package"
 					return 1
 				}
 			fi
 
-			echo "Found ${package} in ${repo}."
+			printf "Found %s in %s\n" "$package" "$repo"
 
 			case "$repo" in
 				(aur)
@@ -239,7 +265,7 @@ main() {
 					abs.get "$package" "$repo";;
 
 				(*)
-					err "Repository $repo not supported."
+					err "Repository %s not supported\n" "$repo"
 					return 1;;
 			esac
 		;;
@@ -247,7 +273,7 @@ main() {
 		(search)
 			if (( flag_search_aur )); then
 				aur.search "$package" || {
-					err "No packages found."
+					err "No packages found\n"
 					return 1
 				}
 			elif (( flag_search_syncdb )); then
@@ -257,7 +283,7 @@ main() {
 				pacman -Ss "$package" 2>/dev/null || { flag_pacman_search_fail=1; }
 
 				if (( flag_aur_search_fail && flag_pacman_search_fail )); then
-					err "No packages found."
+					err "No packages found\n"
 					return 1
 				fi
 			fi
@@ -265,4 +291,5 @@ main() {
 	esac
 }
 
-main $(args_norm "$@")
+set_argv "$@"
+main "${argv[@]}"