Making previous container curl create script a container get script.

Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>

6 files changed, 23 insertions, 28 deletions

diff --git a/Makefile b/Makefile
index 77799aa..1bb8093 100644
--- a/Makefile
+++ b/Makefile
@@ -81,7 +81,7 @@ install: build
 
 	mkdir -p $(DESTDIR)/usr/share/$(SOFTWARE)
 	cp -r VERSION.txt $(DESTDIR)/usr/share/$(SOFTWARE)
-	cp -r share/config share/hooks share/build-scripts $(DESTDIR)/usr/share/$(SOFTWARE)
+	cp -r share/config share/hooks share/build-scripts share/get-scripts $(DESTDIR)/usr/share/$(SOFTWARE)
 
 	mkdir -p $(DESTDIR)/usr/share/bash-completion/completions
 	cp -r share/bash-completion/* $(DESTDIR)/usr/share/bash-completion/completions
diff --git a/share/build-scripts/curl b/share/get-scripts/curl
index 98c2b82..435e8e9 100755
--- a/share/build-scripts/curl
+++ b/share/get-scripts/curl
@@ -23,13 +23,12 @@ PROJECT="open-infrastructure"
 SOFTWARE="compute-tools"
 PROGRAM="container"
 
+SCRIPT="${0}"
+export SCRIPT
+
 HOOKS="/etc/${SOFTWARE}/hooks"
 KEYS="/etc/${SOFTWARE}/keys"
 MACHINES="/var/lib/machines"
-CACHE="/var/cache/${PROGRAM}/system"
-
-SCRIPT="${0}"
-export SCRIPT
 
 Parameters ()
 {
@@ -124,7 +123,7 @@ Parameters ()
 
 Usage ()
 {
-	echo "Usage: container create -n|--name NAME -s|--script ${SCRIPT} -- [--clean] [-p|--password PASSWORD] [--server SERVER] [--setup SETUP] [--system SYSTEM]" >&2
+	echo "Usage: container get -n|--name NAME -s|--script ${SCRIPT} -- [--clean] [-p|--password PASSWORD] [--server SERVER] [--setup SETUP] [--system SYSTEM]" >&2
 	exit 1
 }
 
@@ -178,11 +177,10 @@ fi
 
 SERVER="${SERVER:-https://get.open-infrastructure.net/system/container/debian}"
 PASSWORD="${PASSWORD:-$(dd if=/dev/urandom bs=12 count=1 2> /dev/null | base64)}"
+CACHE="/var/cache/${PROGRAM}/get-$(basename ${SCRIPT})/$(echo ${SERVER} | sed -e 's|.*//||' -e 's|/|_|g')"
 
 VERSION="$(container version)"
 
-export SERVER
-
 Debconf ()
 {
 	# Configure local debconf
@@ -269,7 +267,7 @@ then
 		Debconf
 
 		# Run debconf parts
-		for DEBCONF_SCRIPT in /usr/share/${SOFTWARE}/scripts/curl.d/*
+		for DEBCONF_SCRIPT in /usr/share/${SOFTWARE}/get-scripts/curl.d/*
 		do
 			if [ -x "${DEBCONF_SCRIPT}" ]
 			then
diff --git a/share/build-scripts/curl.d/0001-debconf b/share/get-scripts/curl.d/0001-debconf
index 083d469..083d469 100755
--- a/share/build-scripts/curl.d/0001-debconf
+++ b/share/get-scripts/curl.d/0001-debconf
diff --git a/share/build-scripts/curl.d/0001-debconf.templates b/share/get-scripts/curl.d/0001-debconf.templates
index 59319e4..c63994d 100644
--- a/share/build-scripts/curl.d/0001-debconf.templates
+++ b/share/get-scripts/curl.d/0001-debconf.templates
@@ -8,4 +8,4 @@ Default:
 Choices-C: ${CHOICES_C}
 Choices: ${CHOICES}
 Description: Container list:
- Select the system to use for building the container.
+ Select the system to use for downloading the container.
diff --git a/share/man/container-build.1.rst b/share/man/container-build.1.rst
index 55f2a9b..d4d7fc5 100644
--- a/share/man/container-build.1.rst
+++ b/share/man/container-build.1.rst
@@ -44,9 +44,6 @@ Scripts
 
 The following build scripts are available:
 
-curl:
-  Basic script to build Debian based container, see container-create-curl(1).
-
 debootstrap:
   Basic script to build Debian based container, see
   container-build-debootstrap(1).
diff --git a/share/man/container-create-curl.1.rst b/share/man/container-get-curl.1.rst
index ccf5f3c..ba44ba0 100644
--- a/share/man/container-create-curl.1.rst
+++ b/share/man/container-get-curl.1.rst
@@ -17,13 +17,13 @@
 .. You should have received a copy of the GNU General Public License
 .. along with this program.  If not, see <https://www.gnu.org/licenses/>.
 
-=====================
-container-create-curl
-=====================
+==================
+container-get-curl
+==================
 
--------------------------------------------------------------------------
-Create a Debian based container by downloading a tarball over the network
--------------------------------------------------------------------------
+---------------------------------------------------------------------------
+Download a Debian based container by downloading a tarball over the network
+---------------------------------------------------------------------------
 
 :manual section: 1
 :manual group: Open Infrastructure
@@ -31,12 +31,12 @@ Create a Debian based container by downloading a tarball over the network
 Synopsis
 ========
 
-| **container create -s curl** ['OPTIONS']
+| **container get -s curl** ['OPTIONS']
 
 Description
 ===========
 
-The curl container creation script uses curl(1) to download a tarball over the
+The curl container download script uses curl(1) to download a tarball over the
 network to create a Debian based container.
 
 Depending on the tarball this script otherwise creates a pure Debian system
@@ -65,7 +65,7 @@ The following script options are available:
   Specify container architecture.
 
 --clean:
-  Remove downloaded tarball after successful container creation.
+  Remove container tarball after successful download.
 
 -p, --root-password='PASSWORD':
   Specify the root password, defaults to a random 16 character password.
@@ -89,15 +89,15 @@ The following script options are available:
 Examples
 ========
 
-Create a Debian 11 (bullseye) based container with same architecture as the host
+Download a Debian 11 (bullseye) based container with same architecture as the host
 system:
 
-  sudo container create -s curl -n bullseye.example.net
+  sudo container get -s curl -n bullseye.example.net
 
-Create a Debian 11 (bullseye) based container with different architecture as the
+Download a Debian 11 (bullseye) based container with different architecture as the
 host system:
 
-  sudo container create -s curl -n bullseye-i386.example.net -- --system debian-bullseye-current_i386.system.tar.xz
+  sudo container get -s curl -n bullseye-i386.example.net -- --system debian-bullseye-current_i386.system.tar.xz
 
 Files
 =====
@@ -107,8 +107,8 @@ The following files are used:
 /etc/compute-tools/config:
   Container configuration files.
 
-/usr/share/compute-tools/scripts:
-  Container creation scripts.
+/usr/share/compute-tools/get-scripts:
+  Container download scripts.
 
 /usr/share/doc/compute-tools:
   Container documentation.