Skip to content

Commit 6c94475

Browse files
committed
Use better practices for extract function filename variable
- Use descriptive variable name - Make the variable local
1 parent 6ffa8a9 commit 6c94475

File tree

1 file changed

+16
-15
lines changed

1 file changed

+16
-15
lines changed

arduino-ci-script.sh

Lines changed: 16 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -549,47 +549,48 @@ function extract
549549
echo " extract <path/file_name_1.ext> [path/file_name_2.ext] [path/file_name_3.ext]"
550550
return 1
551551
else
552-
for n in "$@"
552+
local filename
553+
for filename in "$@"
553554
do
554-
if [ -f "$n" ]; then
555-
case "${n%,}" in
555+
if [ -f "$filename" ]; then
556+
case "${filename%,}" in
556557
*.tar.bz2|*.tar.gz|*.tar.xz|*.tbz2|*.tgz|*.txz|*.tar)
557-
tar --extract --file="$n"
558+
tar --extract --file="$filename"
558559
;;
559560
*.lzma)
560-
unlzma $ARDUINO_CI_SCRIPT_QUIET_OPTION ./"$n"
561+
unlzma $ARDUINO_CI_SCRIPT_QUIET_OPTION ./"$filename"
561562
;;
562563
*.bz2)
563-
bunzip2 $ARDUINO_CI_SCRIPT_QUIET_OPTION ./"$n"
564+
bunzip2 $ARDUINO_CI_SCRIPT_QUIET_OPTION ./"$filename"
564565
;;
565566
*.rar)
566-
eval unrar x -ad ./"$n" "$ARDUINO_CI_SCRIPT_VERBOSITY_REDIRECT"
567+
eval unrar x -ad ./"$filename" "$ARDUINO_CI_SCRIPT_VERBOSITY_REDIRECT"
567568
;;
568569
*.gz)
569-
gunzip ./"$n"
570+
gunzip ./"$filename"
570571
;;
571572
*.zip)
572-
unzip -qq ./"$n"
573+
unzip -qq ./"$filename"
573574
;;
574575
*.z)
575-
eval uncompress ./"$n" "$ARDUINO_CI_SCRIPT_VERBOSITY_REDIRECT"
576+
eval uncompress ./"$filename" "$ARDUINO_CI_SCRIPT_VERBOSITY_REDIRECT"
576577
;;
577578
*.7z|*.arj|*.cab|*.chm|*.deb|*.dmg|*.iso|*.lzh|*.msi|*.rpm|*.udf|*.wim|*.xar)
578-
7z x ./"$n"
579+
7z x ./"$filename"
579580
;;
580581
*.xz)
581-
unxz $ARDUINO_CI_SCRIPT_QUIET_OPTION ./"$n"
582+
unxz $ARDUINO_CI_SCRIPT_QUIET_OPTION ./"$filename"
582583
;;
583584
*.exe)
584-
cabextract $ARDUINO_CI_SCRIPT_QUIET_OPTION ./"$n"
585+
cabextract $ARDUINO_CI_SCRIPT_QUIET_OPTION ./"$filename"
585586
;;
586587
*)
587-
echo "extract: '$n' - unknown archive method"
588+
echo "extract: '$filename' - unknown archive method"
588589
return 1
589590
;;
590591
esac
591592
else
592-
echo "extract: '$n' - file does not exist"
593+
echo "extract: '$filename' - file does not exist"
593594
return 1
594595
fi
595596
done

0 commit comments

Comments
 (0)