SC2086

Author: Serock3

gui/scripts/build-logo-icons.sh

@@ -46,8 +46,8 @@ TMP_DIR=$(mktemp -d)
 TMP_ICO_DIR="$TMP_DIR/ico"
 TMP_ICONSET_DIR="$TMP_DIR/icon.iconset"
 
-mkdir $TMP_ICONSET_DIR
-mkdir $TMP_ICO_DIR
+mkdir "$TMP_ICONSET_DIR"
+mkdir "$TMP_ICO_DIR"
 
 COMPRESSION_OPTIONS="-define png:compression-filter=5 -define png:compression-level=9 \
     -define png:compression-strategy=1 -define png:exclude-chunk=all -strip"
@@ -62,36 +62,36 @@ rm "$TMP_ICONSET_DIR"/*
 
 # Linux .icns icon
 for size in 16 32 128 256 512; do
-    double_size=$[$size * 2]
-    rsvg-convert -o $TMP_ICONSET_DIR/icon-$size.png -w $size -h $size $SVG_SOURCE_PATH
-    rsvg-convert -o $TMP_ICONSET_DIR/icon-$size@2x.png -w $double_size -h $double_size \
+    double_size="$[$size * 2]"
+    rsvg-convert -o "$TMP_ICONSET_DIR"/icon-$size.png -w $size -h $size $SVG_SOURCE_PATH
+    rsvg-convert -o "$TMP_ICONSET_DIR"/icon-$size@2x.png -w "$double_size" -h "$double_size" \
         $SVG_SOURCE_PATH
 done
-iconutil --convert icns --output $DIST_ASSETS_DIR/icon.icns $TMP_ICONSET_DIR
-rm -rf $TMP_ICONSET_DIR
+iconutil --convert icns --output $DIST_ASSETS_DIR/icon.icns "$TMP_ICONSET_DIR"
+rm -rf "$TMP_ICONSET_DIR"
 
 # Windows .ico icon
 for size in 16 20 24 30 32 36 40 48 60 64 72 80 96 256 512; do
-    rsvg-convert -o $TMP_ICO_DIR/$size.png -w $size -h $size $SVG_SOURCE_PATH
+    rsvg-convert -o "$TMP_ICO_DIR"/$size.png -w $size -h $size $SVG_SOURCE_PATH
 done
-convert $TMP_ICO_DIR/* $COMPRESSION_OPTIONS $DIST_ASSETS_DIR/icon.ico
-rm -rf $TMP_ICO_DIR
+convert "$TMP_ICO_DIR"/* "$COMPRESSION_OPTIONS" $DIST_ASSETS_DIR/icon.ico
+rm -rf "$TMP_ICO_DIR"
 
 # Windows installer sidebar
 # "bmp3" specifies the Windows 3.x format which is required for the image to be displayed
 sidebar_path="$TMP_DIR/sidebar.png"
 sidebar_logo_size=234
-rsvg-convert -o $sidebar_path -w $sidebar_logo_size -h $sidebar_logo_size $SVG_SOURCE_PATH
-convert -background "#294D73" $sidebar_path \
+rsvg-convert -o "$sidebar_path" -w $sidebar_logo_size -h $sidebar_logo_size $SVG_SOURCE_PATH
+convert -background "#294D73" "$sidebar_path" \
     -gravity center -extent ${sidebar_logo_size}x314 \
     -gravity west -crop 164x314+10+0 bmp3:$DIST_ASSETS_DIR/windows/installersidebar.bmp
-rm $sidebar_path
+rm "$sidebar_path"
 
 # GUI notification icon
 rsvg-convert -o ../assets/images/icon-notification.png -w 128 -h 128 $SVG_SOURCE_PATH
 
 # GUI in app icon
 cp "$SVG_SOURCE_PATH" ../assets/images/logo-icon.svg
 
-rmdir $TMP_DIR
+rmdir "$TMP_DIR"
 

gui/scripts/crowdin.sh

@@ -3,7 +3,7 @@ set -e
 
 BASE_URL=https://api.crowdin.com/api/project/mullvad-app
 SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-ROOT_DIR=$( dirname $SCRIPT_DIR )
+ROOT_DIR=$( dirname "$SCRIPT_DIR" )
 LOCALE_DIR="$ROOT_DIR/locales"
 
 if [ $# -ne 1 ]; then
@@ -32,9 +32,9 @@ function download_translations {
     wget \
         --content-disposition \
         $BASE_URL/download/all.zip?key="$CROWDIN_API_KEY"
-    unzip -o all.zip -d $LOCALE_DIR
-    find $LOCALE_DIR -type d -exec chmod 755 {} \;
-    find $LOCALE_DIR -type f -exec chmod 644 {} \;
+    unzip -o all.zip -d "$LOCALE_DIR"
+    find "$LOCALE_DIR" -type d -exec chmod 755 {} \;
+    find "$LOCALE_DIR" -type f -exec chmod 644 {} \;
     rm all.zip
 }
 

test/ci-runtests.sh

@@ -82,7 +82,7 @@ function is_dev_version {
 function get_app_filename {
     local version=$1
     local os=$2
-    if is_dev_version $version; then
+    if is_dev_version "$version"; then
         # only save 6 chars of the hash
         local commit="${BASH_REMATCH[3]}"
         version="${BASH_REMATCH[1]}${commit}"
@@ -116,19 +116,19 @@ function download_app_package {
     local os=$2
     local package_repo=""
 
-    if is_dev_version $version; then
+    if is_dev_version "$version"; then
         package_repo="${BUILD_DEV_REPOSITORY}"
     else
         package_repo="${BUILD_RELEASE_REPOSITORY}"
     fi
 
-    local filename=$(get_app_filename $version $os)
+    local filename=$(get_app_filename "$version" "$os")
     local url="${package_repo}/$version/$filename"
 
     mkdir -p "$PACKAGES_DIR"
     if [[ ! -f "$PACKAGES_DIR/$filename" ]]; then
         echo "Downloading build for $version ($os) from $url"
-        curl -sf -o "$PACKAGES_DIR/$filename" $url
+        curl -sf -o "$PACKAGES_DIR/$filename" "$url"
     else
         echo "Found build for $version ($os)"
     fi
@@ -137,7 +137,7 @@ function download_app_package {
 function get_e2e_filename {
     local version=$1
     local os=$2
-    if is_dev_version $version; then
+    if is_dev_version "$version"; then
         # only save 6 chars of the hash
         local commit="${BASH_REMATCH[3]}"
         version="${BASH_REMATCH[1]}${commit}"
@@ -164,19 +164,19 @@ function download_e2e_executable {
     local os=$2
     local package_repo=""
 
-    if is_dev_version $version; then
+    if is_dev_version "$version"; then
         package_repo="${BUILD_DEV_REPOSITORY}"
     else
         package_repo="${BUILD_RELEASE_REPOSITORY}"
     fi
 
-    local filename=$(get_e2e_filename $version $os)
+    local filename=$(get_e2e_filename "$version" "$os")
     local url="${package_repo}/$version/additional-files/$filename"
 
-    mkdir -p $PACKAGES_DIR
+    mkdir -p "$PACKAGES_DIR"
     if [[ ! -f "$PACKAGES_DIR/$filename" ]]; then
         echo "Downloading e2e executable for $version ($os) from $url"
-        curl -sf -o "$PACKAGES_DIR/$filename" $url
+        curl -sf -o "$PACKAGES_DIR/$filename" "$url"
     else
         echo "Found e2e executable for $version ($os)"
     fi
@@ -185,8 +185,8 @@ function download_e2e_executable {
 function run_tests_for_os {
     local os=$1
 
-    local prev_filename=$(get_app_filename $OLD_APP_VERSION $os)
-    local cur_filename=$(get_app_filename $NEW_APP_VERSION $os)
+    local prev_filename=$(get_app_filename "$OLD_APP_VERSION" "$os")
+    local cur_filename=$(get_app_filename "$NEW_APP_VERSION" "$os")
 
     rm -f "$SCRIPT_DIR/.ci-logs/${os}_report"
 
@@ -203,10 +203,10 @@ echo "**********************************"
 echo "* Downloading app packages"
 echo "**********************************"
 
-mkdir -p $PACKAGES_DIR
-nice_time download_app_package $OLD_APP_VERSION $TEST_OS
-nice_time download_app_package $NEW_APP_VERSION $TEST_OS
-nice_time download_e2e_executable $NEW_APP_VERSION $TEST_OS
+mkdir -p "$PACKAGES_DIR"
+nice_time download_app_package "$OLD_APP_VERSION" "$TEST_OS"
+nice_time download_app_package "$NEW_APP_VERSION" "$TEST_OS"
+nice_time download_e2e_executable "$NEW_APP_VERSION" "$TEST_OS"
 
 echo "**********************************"
 echo "* Building test runner"