From 0f07198271c336e00738e6037fba7133f4504beb Mon Sep 17 00:00:00 2001
From: Kevin Velghe <kevin@paretje.be>
Date: Tue, 26 Jul 2016 11:39:51 +0200
Subject: [PATCH] Don't pass 2 arguments to shebang
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

On most platforms (according to shellcheck), you can't pass two
arguments in a shebang. I.e. on Debian you get:
/usr/bin/env: ‘bash -e’: No such file or directory
---
 misc/userscripts/open_download | 4 +++-
 misc/userscripts/password_fill | 3 ++-
 misc/userscripts/view_in_mpv   | 4 +++-
 3 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/misc/userscripts/open_download b/misc/userscripts/open_download
index 7ca19a19f..54c9d3e97 100755
--- a/misc/userscripts/open_download
+++ b/misc/userscripts/open_download
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
 # Both standalone script and qutebrowser userscript that opens a rofi menu with
 # all files from the download director and opens the selected file. It works
 # both as a userscript and a standalone script that is called from outside of
@@ -18,6 +18,8 @@
 # Thorsten Wißmann, 2015 (thorsten` on freenode)
 # Any feedback is welcome!
 
+set -e
+
 # open a file from the download directory using rofi
 DOWNLOAD_DIR=${DOWNLOAD_DIR:-$QUTE_DOWNLOAD_DIR}
 DOWNLOAD_DIR=${DOWNLOAD_DIR:-$HOME/Downloads}
diff --git a/misc/userscripts/password_fill b/misc/userscripts/password_fill
index 49fba5c7c..165493380 100755
--- a/misc/userscripts/password_fill
+++ b/misc/userscripts/password_fill
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
 help() {
     blink=$'\e[1;31m' reset=$'\e[0m'
 cat <<EOF
@@ -39,6 +39,7 @@ Configuration:
 EOF
 }
 
+set -o errexit
 set -o pipefail
 shopt -s nocasematch # make regexp matching in bash case insensitive
 
diff --git a/misc/userscripts/view_in_mpv b/misc/userscripts/view_in_mpv
index a79565d9c..e65909b0a 100755
--- a/misc/userscripts/view_in_mpv
+++ b/misc/userscripts/view_in_mpv
@@ -1,4 +1,4 @@
-#!/usr/bin/env bash -e
+#!/usr/bin/env bash
 #
 # Behavior:
 #   Userscript for qutebrowser which views the current web page in mpv using
@@ -24,6 +24,8 @@
 # Thorsten Wißmann, 2015 (thorsten` on freenode)
 # Any feedback is welcome!
 
+set -e
+
 if [ -z "$QUTE_FIFO" ] ; then
     cat 1>&2 <<EOF
 Error: $0 can not be run as a standalone script.