Do not shift an empty list of arguments

diff --git a/cdr-dvdrw-tools/cdrkit/dvdrec-data b/cdr-dvdrw-tools/cdrkit/dvdrec-data
index 550ca4f737d0795df2b11c23d0151c8dc3d1df53..388e09e305e61f02257e95b0384e3e965ad1c7f3 100755 (executable)
--- a/cdr-dvdrw-tools/cdrkit/dvdrec-data
+++ b/cdr-dvdrw-tools/cdrkit/dvdrec-data
@@ -4,8 +4,10 @@
 
 . .config
 
-label="$1"
-shift
+if [ -n "$label" ]; then
+   label="$1"
+   shift
+fi
 
 if [ -z "$label" ]; then
    label="`guess_label.py`"

diff --git a/cdr-dvdrw-tools/dvd+rw-tools/dvdrec-data b/cdr-dvdrw-tools/dvd+rw-tools/dvdrec-data
index dc3f541b0970155e64606dcba3f3c1af8f455afa..4b45cd1df1d07df0752cd1aae2ca0a909e590421 100755 (executable)
--- a/cdr-dvdrw-tools/dvd+rw-tools/dvdrec-data
+++ b/cdr-dvdrw-tools/dvd+rw-tools/dvdrec-data
@@ -4,8 +4,10 @@
 
 . .config
 
-label="$1"
-shift
+if [ -n "$label" ]; then
+   label="$1"
+   shift
+fi
 
 if [ -z "$label" ]; then
    label="`guess_label.py`"

diff --git a/cdr-dvdrw-tools/dvdrw-boot b/cdr-dvdrw-tools/dvdrw-boot
index ab7eee0e2e0060c934ce1e0a7c0326b5f377af85..3c9e6625d6841a410ab5617d7afe738f979af544 100755 (executable)
--- a/cdr-dvdrw-tools/dvdrw-boot
+++ b/cdr-dvdrw-tools/dvdrw-boot
@@ -15,8 +15,8 @@ if [ -z "$1" ]; then
    read boot_img
 else
    boot_img="$1"
+   shift
 fi
-shift
 
 alt_boot=''
 if [ "$@" ]; then

diff --git a/cdr-dvdrw-tools/mk-image b/cdr-dvdrw-tools/mk-image
index ae2a6fc115dc41db2c897d4f4c8642f5bd32ca72..51670ab680bd68e20b10de8de9d436c1b3e33327 100755 (executable)
--- a/cdr-dvdrw-tools/mk-image
+++ b/cdr-dvdrw-tools/mk-image
@@ -11,8 +11,8 @@ if [ -z "$1" ]; then
    read label
 else
    label="$1"
+   shift
 fi
-shift
 
 
 exec genisoimage \