Merge branch 'better-dirty-working-directory-check'

3 files changed, 4 insertions, 4 deletions

diff --git a/build.sh b/build.sh
index 06f87f5667..2ff9cf8a9f 100755
--- a/build.sh
+++ b/build.sh
@@ -120,7 +120,7 @@ else
 fi
 
 if [[ "$SIGN" == "true" ]]; then
-    if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
+    if [[ -n $(git status --porcelain) ]]; then
         log_error "Dirty working directory!"
         log_error "Will only build a signed app in a clean working directory"
         exit 1
diff --git a/desktop/scripts/release/1-prepare-release b/desktop/scripts/release/1-prepare-release
index da6aed637d..b76487d5cb 100755
--- a/desktop/scripts/release/1-prepare-release
+++ b/desktop/scripts/release/1-prepare-release
@@ -37,7 +37,7 @@ function checks {
         exit 1
     fi
 
-    if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
+    if ! git diff-index --quiet HEAD --; then
         log_error "Dirty working directory! Will not accept that for an official release."
         exit 1
     fi
@@ -82,7 +82,7 @@ function check_changelog {
 
 function update_copyright_year {
     $REPO_ROOT/scripts/update-copyright
-    if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
+    if ! git diff-index --quiet HEAD --; then
         print_and_run git commit -a -S -m "Update copyright year in project files and code"
     fi
 }
diff --git a/scripts/localization b/scripts/localization
index 084f61661c..965ca0ff17 100755
--- a/scripts/localization
+++ b/scripts/localization
@@ -51,7 +51,7 @@ function update_relay_locations_pot {
 }
 
 function commit_changes {
-    if [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]]; then
+    if ! git diff-index --quiet HEAD --; then
         git commit -a -S -m "$1"
     fi
 }