From: Oleg Broytman <phd@phdru.name>
Date: Mon, 15 Sep 2014 20:28:20 +0000 (+0400)
Subject: Do not shift an empty list of arguments
X-Git-Url: https://git.phdru.name/?a=commitdiff_plain;h=11ffaed448519d03a27492ce86acaf771d0a003a;p=audio-cdr-video.git

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 550ca4f..388e09e 100755
--- 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 dc3f541..4b45cd1 100755
--- 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 ab7eee0..3c9e662 100755
--- 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 ae2a6fc..51670ab 100755
--- 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 \