Fix jshon calls

Signed-off-by: fbt <fbt@fleshless.org>

README.md

@@ -10,7 +10,8 @@ A very simple AUR/ABS helper. Doesn't build packages, only gets the sources.
 	          -A        Search only in AUR. Implies -s.
 	        -d        Get the package sources (default). Set twice to also get the dependencies.
 	          -n      Don't update existing git repos.
-	        -U        Print out all outdated AUR packages.
+	        -u        Print out all (and download if -d/-dd) outdated AUR packages.
+	        -U <url>  Set AUR url.
 	        -w <dir>  Set the working directory.
 	        --nossl   Set curl's --insecure flag.
 

prm

@@ -24,7 +24,8 @@ usage() {
 		          -A        Search only in AUR. Implies -s.
 		        -d        Get the package sources (default). Set twice to also get the dependencies.
 		          -n      Don't update existing git repos.
-		        -U        Print out all outdated AUR packages.
+		        -u        Print out all (and download if -d/-dd) outdated AUR packages.
+		        -U <url>  Set AUR url.
 		        -w <dir>  Set the working directory.
 		        --nossl   Set curl's --insecure flag.
 	EOF
@@ -33,7 +34,7 @@ usage() {
 aur.search() {
 	declare i aur_api_search_data aur_search_result_num aur_search_results version description
 
-	aur_api_search_data=$( curl "${cfg_curl_opts[@]}" "${cfg_aur_api}?type=search&arg=${1}" )
+	aur_api_search_data=$( curl "${cfg_curl_opts[@]}" "${cfg_aur_api}&type=search&arg=${1}" )
 	aur_search_result_num=$( jshon -e resultcount -u <<< "$aur_api_search_data" )
 
 	# Exit if nothing was found
@@ -56,7 +57,7 @@ aur.search() {
 aur.info() {
 	declare pkg_aur_info aur_query_result
 	
-	pkg_aur_info=$( curl "${cfg_curl_opts[@]}" "${cfg_aur_api}?type=info&v=2&arg=${1}" 2>/dev/null )
+	pkg_aur_info=$( curl "${cfg_curl_opts[@]}" "${cfg_aur_api}&type=info&arg=${1}" 2>/dev/null )
 	aur_query_result=$( jshon -e resultcount -u <<< "$pkg_aur_info" )
 
 	(( aur_query_result )) || { return 1; }
@@ -65,28 +66,40 @@ aur.info() {
 }
 
 aur.get_updates() {
-	declare -a foreign_packages
-	declare p_aur_info p_localver p_aur_version
+	declare -a foreign_packages updated_pkgs
+	declare aur_api_multireq aur_api_data aur_api_data_length n p u n_name n_version l_name l_version
 
 	read -d '' -r -a foreign_packages < <( pacman -Qqm )
 
 	for p in "${foreign_packages[@]}"; do
-		unset p_aur_info
-		read -r p_aur_info < <( aur.info "$p" )
+		aur_api_multireq+="&arg\[\]=$p"
+	done
 
-		if [[ "$p_aur_info" ]]; then
-			read -r p_aur_version < <(
-				jshon -e results -e Version -u <<< "$p_aur_info"
-			)
+	aur_api_data=$( curl "${cfg_curl_opts[@]}" "${cfg_aur_api}&type=info${aur_api_multireq}" )
+	aur_api_data_length=$( jshon -e results -l <<< "$aur_api_data" )
+	(( aur_api_data_length-- ))
 
-			read -r _ p_localver < <( pacman -Q "$p" )
+	for (( n=0; n<=aur_api_data_length; n++ )); do
+		read -r n_name < <( jshon -e results -e "$n" -e Name -u <<< "$aur_api_data")
+		read -r n_version < <( jshon -e results -e "$n" -e Version -u <<< "$aur_api_data" )
+		read -r l_name l_version < <( pacman -Q "$n_name" )
 
-
-			if (( $(vercmp "$p_aur_version" "$p_localver") )); then
-				printf '%s\n' "$p"
-			fi
+		if (( $(vercmp "$n_version" "$l_version") )); then
+			updated_pkgs+=( "$n_name" )
+			printf '%s\n' "$n_name"
 		fi
 	done
+
+	if ! (( ${#updated_pkgs[@]} )); then
+		printf 'No updates found\n'
+		return 0
+	fi
+
+	if (( flag_get )); then
+		for u in "${updated_pkgs[@]}"; do
+			aur.get < <( aur.info "$u" )
+		done
+	fi
 }
 
 aur.get() {
@@ -95,7 +108,7 @@ aur.get() {
 	read -r pkg_aur_info
 
 	# A temporary hack till AUR4 becomes the main version
-	read -r pkg_base < <( jshon -e results -e PackageBase -u <<< "$pkg_aur_info" )
+	read -r pkg_base < <( jshon -e results -a -e Name -u <<< "$pkg_aur_info" )
 	tarball_path="/cgit/aur.git/snapshot/${pkg_base}.tar.gz"
 
 	cd "$cfg_workdir"
@@ -123,8 +136,8 @@ aur.get() {
 		cd "${cfg_workdir}/${pkg_base}"
 
 		read -d '' -r -a depends < <(
-			jshon -e results -e Depends -a -u <<< "$pkg_aur_info" 2>/dev/null
-			jshon -e results -e MakeDepends -a -u <<< "$pkg_aur_info" 2>/dev/null
+			jshon -Q -e results -a -e Depends -a -u <<< "$pkg_aur_info"
+			jshon -Q -e results -a -e MakeDepends -a -u <<< "$pkg_aur_info"
 		)
 
 		for i in "${depends[@]}"; do
@@ -132,7 +145,7 @@ aur.get() {
 			aur_api_multireq+="&arg\[\]=$dep_name"
 		done
 		
-		aur_deps_api_data=$( curl "${cfg_curl_opts[@]}" "${cfg_aur_api}?type=multiinfo${aur_api_multireq}" )
+		aur_deps_api_data=$( curl "${cfg_curl_opts[@]}" "${cfg_aur_api}&type=info${aur_api_multireq}" )
 		aur_deps_count=$( jshon -e resultcount <<< "$aur_deps_api_data" )
 
 		if (( aur_deps_count )); then
@@ -213,26 +226,26 @@ main() {
 
 			(-h) usage; return 0;;
 
-			(-s) action='search';;
+			(-s) flag_search=1;;
 			(-A)
-				action='search'
+				flag_search=1
 				flag_search_aur=1;;
 			(-S)
-				action='search'
+				flag_search=1
 				flag_search_syncdb=1;;
 
-			(-u)
+			(-U)
 				cfg_aur_url="$2"
 				shift;;
 
-			(-U)
-				action='update';;
+			(-u)
+				flag_update=1;;
 
 			(-d)
-				if [[ "$action" == 'get' ]]; then
+				if (( flag_get )); then
 					flag_get_deps=1
 				else
-					action='get'
+					flag_get=1
 				fi
 			;;
 
@@ -259,22 +272,32 @@ main() {
 		unset flag_search_aur flag_search_syncdb
 	}
 
-	cfg_aur_api="${cfg_aur_url}/rpc.php"
+	cfg_aur_api="${cfg_aur_url}/rpc.php/rpc/?v=5"
+
+	if (( flag_search )); then
+		action=search
+	elif (( flag_update )); then
+		action=update
+	elif (( flag_get )); then
+		action=get
+	fi
+
+	if [[ "$1" ]]; then
+		package="$1"
+	fi
 
 	[[ "$action" ]] || {
 		usage
 		return 1
 	}
 
-	if [[ "$1" ]]; then
-		package="$1"
-#	else
-#		usage
-#		return 1
-	fi
-
 	case "$action" in
 		(get)
+			[[ "$package" ]] || {
+				usage
+				return 1
+			}
+
 			[[ -d "$cfg_workdir" ]] || {
 				mkdir -p "$cfg_workdir" || {
 					err "Can't create workdir: %s\n" "$cfg_workdir"
@@ -315,6 +338,11 @@ main() {
 		;;
 
 		(search)
+			[[ "$package" ]] || {
+				usage
+				return 1
+			}
+
 			if (( flag_search_aur )); then
 				aur.search "$package" || {
 					err "No packages found\n"