README

+ a bugfix.

README.md

@@ -2,16 +2,15 @@ zpac
 ----
 A very simple AUR/ABS helper. Doesn't build packages, only gets the sources.
 
-	$ zpac -h
-	Usage: zpac [flags] <package>
-	Flags:
+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.
+        -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/zpac.rc.sh
 By default zpac downloads the sources into the current directory. Controlled by `$cfg_workdir`.
-

zpac

@@ -20,8 +20,9 @@ usage() {
 		        -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
 }
 
@@ -35,7 +36,14 @@ aur.search() {
 		aur_search_results=( $( jshon -e results -a -e Name -u <<< "$aur_api_search_data" ) )
 
 		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" )"
+			{
+				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
 	else
 		return 1
@@ -56,21 +64,32 @@ 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
 	
-	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}" ]] && {
+			echo "Found ${pkg_base} in ${cfg_workdir}, skipping. Use -f to override."
+			return 17
+		}
+	}
 
 	cd "$cfg_workdir"
 
-	echo "Downloading ${cfg_aur_url}${tarball_path}"
+	echo "Working in ${cfg_workdir}"
+
+	echo "Downloading ${pkg_base}"
 	{ curl -skL "${cfg_aur_url}${tarball_path}" | gzip -d | tar x; } || {
 		err "Fail!"
 		return 1
 	}
 
-	echo ": ${cfg_workdir}/${pkg_base}"
-
 	if (( flag_get_deps )); then
 		unset depends makedepends
 
@@ -86,11 +105,18 @@ aur.get() {
 		aur_deps_count=$( jshon -e resultcount <<< "$aur_deps_api_data" )
 
 		if (( aur_deps_count )); then
+			echo "Getting dependencies for ${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 )) && {
+					(( _result == 17 )) || {
+						return "$_result"
+					}
 				}
 			done
 		fi
@@ -113,39 +139,36 @@ abs.get() {
 }
 
 args_norm() {
+	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
 }
@@ -157,6 +180,8 @@ main() {
 
 	while (( $# )); do
 		case "$1" in
+			(--) shift; break;;
+
 			(-h) usage; return 0;;
 
 			(-s) action='search';;
@@ -175,14 +200,19 @@ main() {
 				fi
 			;;
 
-			(--) shift; break;;
+			(-w) 
+				cfg_workdir="$2"
+				shift;;
+
+			(-f) flag_force=1;;
+
 			(-*)
 				err "Unknown key: $1"
 				usage
 				return 1
 			;;
 
-			*) break;;
+			(*) break;;
 		esac
 		shift
 	done
@@ -217,7 +247,7 @@ main() {
 			if (( ! "$?" )); then
 				repo='aur'
 			else
-				while read; do
+				while read -r; do
 					if [[ "$REPLY" =~ ^Repository ]]; then
 						repo="${REPLY##* }"
 					fi
@@ -265,4 +295,5 @@ main() {
 	esac
 }
 
-main $(args_norm "$@")
+args_norm "$@"
+main "${argv[@]}"