From 6f681743ca7905a1eb5d2162595c5bf493636adc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miguel=20A=2E=20Col=C3=B3n=20V=C3=A9lez?= Date: Mon, 27 Jul 2015 14:13:03 -0400 Subject: [PATCH] Use set -e in the body of the script. The script passes -e to the shell on the #! line rather than using set -e in the body of the script. This is fine for normal operation, but if the script is run by hand with sh /path/to/script (common in debugging), -e will not be in effect. It's therefore better to use set -e in the body of the script. --- bin/PCSX2-linux.sh | 4 +++- linux_various/generate_pot.sh | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/bin/PCSX2-linux.sh b/bin/PCSX2-linux.sh index 49764147cb..aba9ab23be 100755 --- a/bin/PCSX2-linux.sh +++ b/bin/PCSX2-linux.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # PCSX2 - PS2 Emulator for PCs # Copyright (C) 2002-2011 PCSX2 Dev Team @@ -23,6 +23,8 @@ # easiest solution it to ship library used during the build. # 3/ Set __GL_THREADED_OPTIMIZATIONS variable for Nvidia Drivers (major speed boost) +set -e + current_script=$0 me=PCSX2-linux.sh diff --git a/linux_various/generate_pot.sh b/linux_various/generate_pot.sh index 37a1fbe54d..74fa70cf7c 100644 --- a/linux_various/generate_pot.sh +++ b/linux_various/generate_pot.sh @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/sh # PCSX2 - PS2 Emulator for PCs # Copyright (C) 2002-2014 PCSX2 Dev Team @@ -16,6 +16,8 @@ # This script call xgettext utility to generate some nice pot (translation template) files +set -e + ###################################################################### # Script configuration ######################################################################