Updating packaging for container create to container build command rename.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

4 files changed, 24 insertions, 18 deletions

diff --git a/debian/open-infrastructure-container-tools.config b/debian/open-infrastructure-container-tools.config
index d50839e..2dc080c 100644
--- a/debian/open-infrastructure-container-tools.config
+++ b/debian/open-infrastructure-container-tools.config
@@ -30,13 +30,13 @@ db_settitle open-infrastructure-container-tools/title
 db_input low open-infrastructure-container-tools/cache || true
 db_go
 
-if [ -e /usr/share/compute-tools/scripts ]
+if [ -e /usr/share/compute-tools/build-scripts ]
 then
-	SCRIPT_CHOICES="$(cd /usr/share/compute-tools/scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort)"
-	db_subst open-infrastructure-container-tools/script SCRIPT_CHOICES "$(echo ${SCRIPT_CHOICES} | sed -e 's| |, |g')"
+	SCRIPT_CHOICES="$(cd /usr/share/compute-tools/build-scripts && find -maxdepth 1 -not -type d -and -not -name 'default' -and -not -name 'debconf' -and -not -name '*.d' -printf '%P\n' | sort)"
+	db_subst open-infrastructure-container-tools/build-script SCRIPT_CHOICES "$(echo ${SCRIPT_CHOICES} | sed -e 's| |, |g')"
 
 	db_settitle open-infrastructure-container-tools/title
-	db_input low open-infrastructure-container-tools/script || true
+	db_input low open-infrastructure-container-tools/build-script || true
 	db_go
 fi
 
diff --git a/debian/open-infrastructure-container-tools.postinst b/debian/open-infrastructure-container-tools.postinst
index 44d0582..f0eff2b 100755
--- a/debian/open-infrastructure-container-tools.postinst
+++ b/debian/open-infrastructure-container-tools.postinst
@@ -40,11 +40,14 @@ Install ()
 
 case "${1}" in
 	configure)
-		update-alternatives --quiet --install /usr/share/compute-tools/scripts/default container_script /usr/share/compute-tools/scripts/curl 1000
-		update-alternatives --quiet --install /usr/share/compute-tools/scripts/default container_script /usr/share/compute-tools/scripts/mmdebstrap 2000
-		update-alternatives --quiet --install /usr/share/compute-tools/scripts/default container_script /usr/share/compute-tools/scripts/debootstrap 3000
-		update-alternatives --quiet --install /usr/share/compute-tools/scripts/default container_script /usr/share/compute-tools/scripts/progress-linux 4000
-		update-alternatives --quiet --install /usr/share/compute-tools/scripts/default container_script /usr/share/compute-tools/scripts/debian 5000
+		# build-scripts
+		update-alternatives --quiet --install /usr/share/compute-tools/build-scripts/default container_build-script /usr/share/compute-tools/build-scripts/mmdebstrap 1000
+		update-alternatives --quiet --install /usr/share/compute-tools/build-scripts/default container_build-script /usr/share/compute-tools/build-scripts/debootstrap 2000
+		update-alternatives --quiet --install /usr/share/compute-tools/build-scripts/default container_build-script /usr/share/compute-tools/build-scripts/progress-linux 3000
+		update-alternatives --quiet --install /usr/share/compute-tools/build-scripts/default container_build-script /usr/share/compute-tools/build-scripts/debian 4000
+
+		# get-scripts
+		update-alternatives --quiet --install /usr/share/compute-tools/get-scripts/default container_get-script /usr/share/compute-tools/get-scripts/curl 1000
 
 		. /usr/share/debconf/confmodule
 
@@ -66,7 +69,7 @@ case "${1}" in
 		db_get open-infrastructure-container-tools/cache
 		CACHE="${RET:-/var/cache/container}" # string (w/o empty)
 
-		db_get open-infrastructure-container-tools/script
+		db_get open-infrastructure-container-tools/build-script
 		SCRIPT="${RET:-debian}" # string (w/o empty)
 
 		db_get open-infrastructure-container-tools/irc
@@ -81,7 +84,7 @@ case "${1}" in
 		Install "/etc/compute-tools/keys" "${KEYS}"
 		Install "/var/cache/container" "${CACHE}"
 
-		update-alternatives --quiet --set container_script "/usr/share/compute-tools/scripts/${SCRIPT}"
+		update-alternatives --quiet --set container_build-script "/usr/share/compute-tools/build-scripts/${SCRIPT}"
 
 		if [ ! -e "${CONFFILE}" ]
 		then
diff --git a/debian/open-infrastructure-container-tools.prerm b/debian/open-infrastructure-container-tools.prerm
index fa7b814..3650635 100755
--- a/debian/open-infrastructure-container-tools.prerm
+++ b/debian/open-infrastructure-container-tools.prerm
@@ -4,11 +4,14 @@ set -e
 
 case "${1}" in
 	remove|upgrade|deconfigure)
-		update-alternatives --quiet --remove container_script /usr/share/compute-tools/scripts/curl
-		update-alternatives --quiet --remove container_script /usr/share/compute-tools/scripts/mmdebstrap
-		update-alternatives --quiet --remove container_script /usr/share/compute-tools/scripts/debootstrap
-		update-alternatives --quiet --remove container_script /usr/share/compute-tools/scripts/progress-linux
-		update-alternatives --quiet --remove container_script /usr/share/compute-tools/scripts/debian
+		# build-scripts
+		update-alternatives --quiet --remove container_build-script /usr/share/compute-tools/build-scripts/mmdebstrap
+		update-alternatives --quiet --remove container_build-script /usr/share/compute-tools/build-scripts/debootstrap
+		update-alternatives --quiet --remove container_build-script /usr/share/compute-tools/build-scripts/progress-linux
+		update-alternatives --quiet --remove container_build-script /usr/share/compute-tools/build-scripts/debian
+
+		# get-scripts
+		update-alternatives --quiet --remove container_get-script /usr/share/compute-tools/get-scripts/curl
 		;;
 
 	failed-upgrade)
diff --git a/debian/open-infrastructure-container-tools.templates b/debian/open-infrastructure-container-tools.templates
index 36b7efa..98335a6 100644
--- a/debian/open-infrastructure-container-tools.templates
+++ b/debian/open-infrastructure-container-tools.templates
@@ -61,11 +61,11 @@ _Description: cache directory:
  If unsure, use /var/cache/container (default) or
  /srv/container/cache when using shared storage.
 
-Template: open-infrastructure-container-tools/script
+Template: open-infrastructure-container-tools/build-script
 Type: select
 Choices: ${SCRIPT_CHOICES}
 Default: debian
-_Description: create script:
+_Description: default build script:
  Please select the script that will be used by default to create
  containers.
  .