From dd00a16659323c70ac137490ee53361043da127b Mon Sep 17 00:00:00 2001
From: Castulo Martinez <castulo.martinez@intel.com>
Date: Thu, 21 Nov 2019 11:25:30 -0800
Subject: [PATCH] Adding autocompletion for 3rd-party bundle-add

Signed-off-by: Castulo Martinez <castulo.martinez@intel.com>
---
 swupd.bash | 32 ++++++++++++++++++--------------
 swupd.zsh  |  1 +
 2 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/swupd.bash b/swupd.bash
index ea1de16b..76855f6f 100644
--- a/swupd.bash
+++ b/swupd.bash
@@ -45,7 +45,7 @@ _swupd()
 		opts="$global --download --status --force --migrate --allow-mix-collisions --keepcache --update-search-file-index "
 		break;;
 		("bundle-add")
-		opts="$global --skip-diskspace-check "
+		opts="$global --skip-diskspace-check --skip-optional "
 		break;;
 		("bundle-remove")
 		opts="$global --force --recursive "
@@ -84,7 +84,7 @@ _swupd()
 		opts="$global --version --manifest --fix --picky --picky-tree --picky-whitelist --install --quick --force --install "
 		break;;
 		("3rd-party")
-		opts="$global add remove list"
+		opts="$global add remove list bundle-add"
 		break;;
 		("add")
 		opts="$global --repo"
@@ -99,19 +99,23 @@ _swupd()
 	then
 	case "${COMP_WORDS[$i]}" in
 		("bundle-add")
-		MoM=""
-		if [ -r /var/tmp/swupd/Manifest.MoM ]
-		then MoM=/var/tmp/swupd/Manifest.MoM
-		elif [ -r /var/lib/swupd/version ] &&
-			   installed=$(</var/lib/swupd/version) &&
-			   [ -r "/var/lib/swupd/$installed/Manifest.MoM" ]
-		then
-			MoM=/var/lib/swupd/$installed/Manifest.MoM
+		# only show the list of upstream bundles if not using "3rd-party bundle-add"
+		if [ "${COMP_WORDS[$i - 1]}" != "3rd-party" ]; then
+			MoM=""
+			if [ -r /var/tmp/swupd/Manifest.MoM ]
+			then MoM=/var/tmp/swupd/Manifest.MoM
+			elif [ -r /var/lib/swupd/version ] &&
+				   installed=$(</var/lib/swupd/version) &&
+				   [ -r "/var/lib/swupd/$installed/Manifest.MoM" ]
+			then
+				MoM=/var/lib/swupd/$installed/Manifest.MoM
+			fi
+			if [ -n "$MoM" ]
+			then
+				opts+="$( sed '/^[^M]/d' "$MoM" | cut -f4 | LC_ALL=C sort )"
+			fi
 		fi
-		if [ -n "$MoM" ]
-		then
-			opts+="$( sed '/^[^M]/d' "$MoM" | cut -f4 | LC_ALL=C sort )"
-		fi ;;
+		;;
 		("bundle-remove")
 		opts+=" $(unset CDPATH; test -d /usr/share/clear/bundles && \
 			find /usr/share/clear/bundles/ -maxdepth 1 -type f ! -name os-core -printf '%f ')"
diff --git a/swupd.zsh b/swupd.zsh
index 956039b9..a4b293c1 100644
--- a/swupd.zsh
+++ b/swupd.zsh
@@ -190,6 +190,7 @@ if [[ -n "$state" ]]; then
           '(help)list[List third party repo(s)]'
           '(help)remove[Remove third party repo]'
           '(help)add[Add third party repo]'
+          '(help)bundle-add[Install a bundle from a third party repository]'
           _arguments $thirdparty && ret=0
           ;;
           add)