From e86bd108c7fdb7267af64aae18197fe0fd5d5a8c Mon Sep 17 00:00:00 2001
From: Daniel Baumann <daniel.baumann@progress-linux.org>
Date: Fri, 31 Dec 2021 06:15:26 +0100
Subject: Merging upstream version 20211231.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
---
 libexec/container/update | 59 +++++++++++++++++++++++++++++++++++++++++++++---
 1 file changed, 56 insertions(+), 3 deletions(-)

(limited to 'libexec')

diff --git a/libexec/container/update b/libexec/container/update
index adfee65..c5ff6c2 100755
--- a/libexec/container/update
+++ b/libexec/container/update
@@ -28,8 +28,8 @@ HOOKS="/etc/${SOFTWARE}/hooks"
 
 Parameters ()
 {
-	GETOPT_LONGOPTIONS="name:,full-upgrade,autoremove,purge,yes,"
-	GETOPT_OPTIONS="n:,f,r,p,y,"
+	GETOPT_LONGOPTIONS="name:,full-upgrade,interactive,autoremove,purge,yes,"
+	GETOPT_OPTIONS="n:,f,i,r,p,y,"
 
 	PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${COMMAND} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
 
@@ -54,6 +54,11 @@ Parameters ()
 				shift 1
 				;;
 
+			-i|--interactive)
+				INTERACTIVE="true"
+				shift 1
+				;;
+
 			-r|--autoremove)
 				AUTOREMOVE="true"
 				shift 1
@@ -84,7 +89,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-f|--full-upgrade] [-r|--autoremove] [-p|--purge] [-y|--yes]" >&2
+	echo "Usage: ${PROGRAM} ${COMMAND} -n|--name NAME [-f|--full-upgrade] [-i|--interactive] [-r|--autoremove] [-p|--purge] [-y|--yes]" >&2
 	echo
 	echo "See ${COMMAND}(1), ${PROGRAM}(1) and ${PROJECT}(7) for more information."
 
@@ -93,6 +98,11 @@ Usage ()
 
 Parameters "${@}"
 
+if [ -z "${NAME}" ]
+then
+	Usage
+fi
+
 Notification ()
 {
 	TYPE="${1}"
@@ -152,9 +162,52 @@ do
 	fi
 done
 
+if [ $(echo ${NAMES} | wc -w) -gt 1 ]
+then
+	NAME_LOOP="true"
+else
+	NAME_LOOP="false"
+fi
+
 # Run
 for NAME in ${NAMES}
 do
+	case "${INTERACTIVE}" in
+		true)
+			case "${NAME_LOOP}" in
+				true)
+					echo
+					;;
+			esac
+
+			echo -n "'${NAME}': update container '${NAME}' [y|N|a]? "
+			read UPDATE
+
+			UPDATE="$(echo ${UPDATE} | tr '[A-Z]' '[a-z]')"
+
+			case "${UPDATE}" in
+				a|all)
+					INTERACTIVE="false"
+					;;
+
+				y|yes)
+					;;
+
+				*)
+					case "${NAME_LOOP}" in
+						true)
+							continue
+							;;
+
+						*)
+							exit 1
+							;;
+					esac
+					;;
+			esac
+			;;
+	esac
+
 	echo "################################################################################"
 	echo "Updating ${NAME}"
 	echo "################################################################################"
-- 
cgit v1.2.3