summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorfrnmst/Franco Masotti2016-12-27 23:27:18 +0100
committerfrnmst/Franco Masotti2016-12-27 23:27:18 +0100
commit84a15fab5d347b8cb36f9294e51cd6f1fc3e47fa (patch)
treea7a269e26ac80d9703ce6ba19a441e47be5ce691
parent486cd1011db67dfe820646bf9b75b877eb9b2022 (diff)
downloadaur-84a15fab5d347b8cb36f9294e51cd6f1fc3e47fa.tar.gz
Updated.
-rw-r--r--.SRCINFO2
-rw-r--r--PKGBUILD2
-rwxr-xr-xrun.sh19
3 files changed, 16 insertions, 7 deletions
diff --git a/.SRCINFO b/.SRCINFO
index f0202bf4fbad..d419c472daa4 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
pkgbase = rserve-sandbox-docker
pkgdesc = Docker spec for running Rserve in a sandbox
pkgver = r24.8499ca9
- pkgrel = 3
+ pkgrel = 4
url = https://github.com/frnmst/rserve-sandbox
install = .install
arch = x86_64
diff --git a/PKGBUILD b/PKGBUILD
index 39ac339f56bb..bb7c79415ca4 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
# Contributor: Franco Masotti <franco dot masotti at student dot unife dot it>
pkgname=rserve-sandbox-docker
pkgver=r24.8499ca9
-pkgrel=3
+pkgrel=4
pkgdesc="Docker spec for running Rserve in a sandbox"
arch=('x86_64')
url="https://github.com/frnmst/rserve-sandbox"
diff --git a/run.sh b/run.sh
index fcc09cf13d13..7f1c63d4b93a 100755
--- a/run.sh
+++ b/run.sh
@@ -31,14 +31,15 @@ docker_image_name="rserve"
help()
{
cat<<-EOF
-rsd [OPTION]
+rserve-sandbox-docker [OPTION]
Docker spec for running Rserve in a sandbox
Only a single option is permitted.
-h print this help
- -i install dependencies
- -k kill rserve-sandbox-docker
- -s start rserve-sandbox-docker
+ -i install image and dependencies
+ -k kill the container
+ -r remove the docker image
+ -s start the container
Exit status:
0 if OK,
@@ -83,6 +84,13 @@ killd()
fi
}
+# Remove the docker image.
+remove()
+{
+ installed \
+&& killd \
+&& make -C "$pkg_dir" remove
+}
startd()
{
@@ -151,11 +159,12 @@ write_pid_file()
option_parser()
{
- getopts ":hiks" opt "$@"
+ getopts ":hikrs" opt "$@"
case "$opt" in
h ) help ;;
i ) init ;;
k ) killd ;;
+ r ) remove ;;
s ) startd ;;
? ) help; return 1 ;;
esac