From 8c4610ee9c13b338acde1d42406dca8d97f6c193 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Fri, 25 Nov 2016 08:40:47 +0100 Subject: Renaming too generic internal getopt variables to avoid possible collisions in the future. Signed-off-by: Daniel Baumann --- share/scripts/curl | 6 +++--- share/scripts/debconf | 6 +++--- share/scripts/debootstrap | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) (limited to 'share/scripts') 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 -- cgit v1.2.3