From 595a53ad3b29570bed35764b0b2cbfdda9af2dfe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fran=C3=A7ois=20Chavant?= <github@mail.chavant.info>
Date: Sat, 2 Dec 2017 19:23:55 +0100
Subject: [PATCH] Apply patch from #1697

---
 misc/userscripts/open_download    |  3 ++-
 misc/userscripts/password_fill    |  6 +++---
 misc/userscripts/qutedmenu        | 12 +++---------
 misc/userscripts/taskadd          |  6 +++---
 scripts/dev/ci/travis_install.sh  |  6 +++---
 scripts/dev/quit_segfault_test.sh | 10 ++++------
 6 files changed, 18 insertions(+), 25 deletions(-)

diff --git a/misc/userscripts/open_download b/misc/userscripts/open_download
index 6c1213b65..85ea7f849 100755
--- a/misc/userscripts/open_download
+++ b/misc/userscripts/open_download
@@ -76,6 +76,7 @@ crop-first-column() {
 ls-files() {
     # add the slash at the end of the download dir enforces to follow the
     # symlink, if the DOWNLOAD_DIR itself is a symlink
+    # shellcheck disable=SC2010
     ls -Q --quoting-style escape    -h  -o -1 -A -t "${DOWNLOAD_DIR}/" \
         | grep '^[-]' \
         | cut -d' ' -f3- \
@@ -94,7 +95,7 @@ fi
 line=$(printf "%s\n" "${entries[@]}"  \
        | crop-first-column 55 \
        | column -s $'\t' -t \
-       | $ROFI_CMD "${rofi_default_args[@]}" $ROFI_ARGS) || true
+       | $ROFI_CMD "${rofi_default_args[@]}" "$ROFI_ARGS") || true
 if [ -z "$line" ];  then
     exit 0
 fi
diff --git a/misc/userscripts/password_fill b/misc/userscripts/password_fill
index af394ac2c..f2157f190 100755
--- a/misc/userscripts/password_fill
+++ b/misc/userscripts/password_fill
@@ -236,7 +236,7 @@ pass_backend() {
         if ((match_line)) ; then
             # add entries with matching URL-tag
             while read -r -d "" passfile ; do
-                if $GPG "${GPG_OPTS}" -d "$passfile" \
+                if $GPG "${GPG_OPTS[@]}" -d "$passfile" \
                      | grep --max-count=1 -iE "${match_line_pattern}${url}" > /dev/null
                 then
                     passfile="${passfile#$PREFIX}"
@@ -269,7 +269,7 @@ pass_backend() {
                     break
                 fi
             fi
-        done < <($GPG "${GPG_OPTS}" -d "$path" )
+        done < <($GPG "${GPG_OPTS[@]}" -d "$path" )
     }
 }
 # =======================================================
@@ -283,7 +283,7 @@ secret_backend() {
     query_entries() {
         local domain="$1"
         while read -r line ; do
-            if [[ "$line" =~ "attribute.username = " ]] ; then
+            if [[ "$line" == "attribute.username ="* ]] ; then
                 files+=("$domain ${line#${BASH_REMATCH[0]}}")
             fi
         done < <( secret-tool search --unlock --all domain "$domain" 2>&1 )
diff --git a/misc/userscripts/qutedmenu b/misc/userscripts/qutedmenu
index 3f8b13514..b753c6d5b 100755
--- a/misc/userscripts/qutedmenu
+++ b/misc/userscripts/qutedmenu
@@ -35,17 +35,11 @@ get_selection() {
 
 # Main
 # https://github.com/halfwit/dotfiles/blob/master/.config/dmenu/font
-if [[ -s $confdir/dmenu/font ]]; then
-    read -r font < "$confdir"/dmenu/font
-fi
+[[ -s $confdir/dmenu/font ]] && read -r font < "$confdir"/dmenu/font
 
-if [[ $font ]]; then
-    opts+=(-fn "$font")
-fi
+[[ $font ]] && opts+=(-fn "$font")
 
-if [[ -s $optsfile ]]; then
-    source "$optsfile"
-fi
+[[ -s $optsfile ]] && source "$optsfile"
 
 url=$(get_selection)
 url=${url/*http/http}
diff --git a/misc/userscripts/taskadd b/misc/userscripts/taskadd
index 6add71c68..9c70fb978 100755
--- a/misc/userscripts/taskadd
+++ b/misc/userscripts/taskadd
@@ -25,12 +25,12 @@
 [[ $QUTE_MODE == 'hints' ]] && title=$QUTE_SELECTED_TEXT || title=$QUTE_TITLE
 
 # try to add the task and grab the output
-msg="$(task add $title $@ 2>&1)"
+msg="$(task add "$title" "$*" 2>&1)"
 
 if [[ $? == 0 ]]; then
     # annotate the new task with the url, send the output back to the browser
     task +LATEST annotate "$QUTE_URL"
-    echo "message-info '$msg'" >> $QUTE_FIFO
+    echo "message-info '$msg'" >> "$QUTE_FIFO"
 else
-    echo "message-error '$msg'" >> $QUTE_FIFO
+    echo "message-error '$msg'" >> "$QUTE_FIFO"
 fi
diff --git a/scripts/dev/ci/travis_install.sh b/scripts/dev/ci/travis_install.sh
index 4c599aac6..45bb5fe1e 100644
--- a/scripts/dev/ci/travis_install.sh
+++ b/scripts/dev/ci/travis_install.sh
@@ -27,17 +27,17 @@ travis_retry() {
     local count=1
     while (( count < 3 )); do
         if (( result != 0 )); then
-            echo -e "\n${ANSI_RED}The command \"$@\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2
+            echo -e "\n${ANSI_RED}The command \"$*\" failed. Retrying, $count of 3.${ANSI_RESET}\n" >&2
         fi
         "$@"
         result=$?
         (( result == 0 )) && break
-        count=$(($count + 1))
+        count=$(( count + 1 ))
         sleep 1
     done
 
     if (( count > 3 )); then
-        echo -e "\n${ANSI_RED}The command \"$@\" failed 3 times.${ANSI_RESET}\n" >&2
+        echo -e "\n${ANSI_RED}The command \"$*\" failed 3 times.${ANSI_RESET}\n" >&2
     fi
 
     return $result
diff --git a/scripts/dev/quit_segfault_test.sh b/scripts/dev/quit_segfault_test.sh
index 655eb262a..389f125b9 100755
--- a/scripts/dev/quit_segfault_test.sh
+++ b/scripts/dev/quit_segfault_test.sh
@@ -1,14 +1,12 @@
-#!/bin/bash
+#!/usr/bin/env bash
 
-if [[ $PWD == */scripts ]]; then
-    cd ..
-fi
+[[ $PWD == */scripts ]] && cd ..
 
 echo > crash.log
 while :; do
     exit=0
-    while (( $exit == 0)); do
-        duration=$(($RANDOM%10000))
+    while (( exit == 0 )); do
+        duration=$(( RANDOM % 10000 ))
         python3 -m qutebrowser --debug ":later $duration quit" http://www.heise.de/
         exit=$?
     done