Merge commit '610699'

Conflicts:
	src/abslibre-tools/createworkdir

5 files changed, 6 insertions, 5 deletions

diff --git a/src/abslibre-tools/createworkdir b/src/abslibre-tools/createworkdir
index c7b2564..a251d40 100755
--- a/src/abslibre-tools/createworkdir
+++ b/src/abslibre-tools/createworkdir
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 set -euE
 # CreateWorkDir
 # Creates a dir structure for working with Parabola packages
diff --git a/src/abslibre-tools/diff-unfree b/src/abslibre-tools/diff-unfree
index b143a99..b3e2327 100755
--- a/src/abslibre-tools/diff-unfree
+++ b/src/abslibre-tools/diff-unfree
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # This script will help you diff a *-libre PKGBUILD against the unfree one
 # to check for updates.
 # Copyright 2010 Nicolás Reynolds
diff --git a/src/abslibre-tools/libreaddiff b/src/abslibre-tools/libreaddiff
index dde16b3..9f5ae27 100755
--- a/src/abslibre-tools/libreaddiff
+++ b/src/abslibre-tools/libreaddiff
@@ -1,4 +1,5 @@
-#!/bin/bash -e
+#!/usr/bin/env bash
+set -e
 # -*- coding: utf-8 -*-
 # Copyright (C) 2011, 2012  Michał Masłowski  <mtjm@mtjm.eu>
 #
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease
index 8bd5934..f0d59e3 100755
--- a/src/abslibre-tools/librerelease
+++ b/src/abslibre-tools/librerelease
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # Librerelease
 # Uploads packages into [staging]
 
diff --git a/src/abslibre-tools/librestage b/src/abslibre-tools/librestage
index 96e60ff..6bbe80e 100755
--- a/src/abslibre-tools/librestage
+++ b/src/abslibre-tools/librestage
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 # LibreStage
 # Prepares packages for upload