diff --git a/tools/update-packaging/make_full_update.sh b/tools/update-packaging/make_full_update.sh index 97749b505688..c280ea6763fd 100755 --- a/tools/update-packaging/make_full_update.sh +++ b/tools/update-packaging/make_full_update.sh @@ -42,8 +42,7 @@ if test $? -ne 0 ; then exit 1 fi -list=$(list_files) -eval "files=($list)" +files=($(list_files)) popd @@ -53,7 +52,7 @@ mkdir -p "$workdir" num_files=${#files[*]} for ((i=0; $i<$num_files; i=$i+1)); do - f=${files[$i]} + eval "f=${files[$i]}" notice "processing $f" diff --git a/tools/update-packaging/make_incremental_update.sh b/tools/update-packaging/make_incremental_update.sh index 80e0d1ef118d..61e4182e712b 100755 --- a/tools/update-packaging/make_incremental_update.sh +++ b/tools/update-packaging/make_incremental_update.sh @@ -76,8 +76,7 @@ if test $? -ne 0 ; then exit 1 fi -list=$(list_files) -eval "oldfiles=($list)" +oldfiles=($(list_files)) popd @@ -87,7 +86,7 @@ if test $? -ne 0 ; then fi list=$(list_files) -eval "newfiles=($list)" +newfiles=($(list_files)) popd @@ -97,7 +96,7 @@ mkdir -p "$workdir" num_oldfiles=${#oldfiles[*]} for ((i=0; $i<$num_oldfiles; i=$i+1)); do - f=${oldfiles[$i]} + eval "f=${oldfiles[$i]}" # This file is created by Talkback, so we can ignore it if [ "$f" = "readme.txt" ]; then @@ -147,11 +146,11 @@ done num_newfiles=${#newfiles[*]} for ((i=0; $i<$num_newfiles; i=$i+1)); do - f="${newfiles[$i]}" + eval "f=${newfiles[$i]}" # If we've already tested this file, then skip it for ((j=0; $j<$num_oldfiles; j=$j+1)); do - if [ "$f" = "${oldfiles[j]}" ]; then + if [ "\"$f\"" = "${oldfiles[j]}" ]; then continue 2 fi done diff --git a/tools/update-packaging/unwrap_full_update.sh b/tools/update-packaging/unwrap_full_update.sh index 5b0e16470cb8..140bdf71ad8a 100755 --- a/tools/update-packaging/unwrap_full_update.sh +++ b/tools/update-packaging/unwrap_full_update.sh @@ -36,8 +36,7 @@ fi archive="$1" # Generate a list of all files in the archive. -list=$($MAR -t "$archive" | cut -d' ' -f3) -eval "files=($list)" +files=($($MAR -t "$archive" | cut -d' ' -f3)) # Extract the files, creating subdirectories. The resulting files are bzip2 # compressed, so we need to walk the list of files, and decompress them. @@ -48,7 +47,7 @@ num_files=${#files[*]} # Skip first "file" since it is actually the column header string "NAME" that # does not correspond to an actual file in the archive. for ((i=1; $i<$num_files; i=$i+1)); do - f=${files[$i]} + eval "f=${files[$i]}" echo " decompressing $f"