summaryrefslogtreecommitdiffstats
path: root/share/scripts
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-11-25 07:40:47 +0000
committerDaniel Baumann <daniel.baumann@open-infrastructure.net>2016-11-25 10:21:12 +0000
commit8c4610ee9c13b338acde1d42406dca8d97f6c193 (patch)
treed7cb8cbda8af738e06e6a1b77a4c98edbc82dad9 /share/scripts
parentReleasing version 20161122. (diff)
downloadcompute-tools-8c4610ee9c13b338acde1d42406dca8d97f6c193.tar.xz
compute-tools-8c4610ee9c13b338acde1d42406dca8d97f6c193.zip
Renaming too generic internal getopt variables to avoid possible collisions in the future.
Signed-off-by: Daniel Baumann <daniel.baumann@open-infrastructure.net>
Diffstat (limited to '')
-rwxr-xr-xshare/scripts/curl6
-rwxr-xr-xshare/scripts/debconf6
-rwxr-xr-xshare/scripts/debootstrap6
3 files changed, 9 insertions, 9 deletions
diff --git a/share/scripts/curl b/share/scripts/curl
index b67cbd4..6b7d6a0 100755
--- a/share/scripts/curl
+++ b/share/scripts/curl
@@ -25,10 +25,10 @@ CACHE="/var/cache/container-tools/images"
Parameters ()
{
- LONG_OPTIONS="bind:,script:,name:,clean,image:,server:,password:"
- OPTIONS="b:,s:,n:,p:"
+ GETOPT_LONGOPTIONS="bind:,script:,name:,clean,image:,server:,password:"
+ GETOPT_OPTIONS="b:,s:,n:,p:"
- PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${SCRIPT} --options ${OPTIONS} --shell sh -- ${@})"
+ PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${SCRIPT} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
if [ "${?}" != "0" ]
then
diff --git a/share/scripts/debconf b/share/scripts/debconf
index 1cb49b0..8abcb17 100755
--- a/share/scripts/debconf
+++ b/share/scripts/debconf
@@ -25,10 +25,10 @@ MACHINES="/var/lib/machines"
Parameters ()
{
- LONG_OPTIONS="bind:,script:,name:,preseed-file:"
- OPTIONS="b:,s:,n:,p:"
+ GETOPT_LONGOPTIONS="bind:,script:,name:,preseed-file:"
+ GETOPT_OPTIONS="b:,s:,n:,p:"
- PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${SCRIPT} --options ${OPTIONS} --shell sh -- ${@})"
+ PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${SCRIPT} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
if [ "${?}" != "0" ]
then
diff --git a/share/scripts/debootstrap b/share/scripts/debootstrap
index e04f32d..9c76ba0 100755
--- a/share/scripts/debootstrap
+++ b/share/scripts/debootstrap
@@ -24,10 +24,10 @@ MACHINES="/var/lib/machines"
Parameters ()
{
- LONG_OPTIONS="bind:,script:,name:,architecture:,distribution:,mirror:,password:"
- OPTIONS="b:,s:,n:,a:,d:,m:,p:"
+ GETOPT_LONGOPTIONS="bind:,script:,name:,architecture:,distribution:,mirror:,password:"
+ GETOPT_OPTIONS="b:,s:,n:,a:,d:,m:,p:"
- PARAMETERS="$(getopt --longoptions ${LONG_OPTIONS} --name=${SCRIPT} --options ${OPTIONS} --shell sh -- ${@})"
+ PARAMETERS="$(getopt --longoptions ${GETOPT_LONGOPTIONS} --name=${SCRIPT} --options ${GETOPT_OPTIONS} --shell sh -- ${@})"
if [ "${?}" != "0" ]
then