From 462f80237dc0b610f75a5782bf457a8d5291177f Mon Sep 17 00:00:00 2001 From: Thomas Perl Date: Sat, 25 Feb 2012 15:41:41 +0100 Subject: [PATCH] Minor fixes to merge-from-transifex.sh --- po/merge-from-transifex.sh | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/po/merge-from-transifex.sh b/po/merge-from-transifex.sh index 280c4eea..946fc9bc 100644 --- a/po/merge-from-transifex.sh +++ b/po/merge-from-transifex.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash # # merge-from-transifex.sh # Fix problems with the "tx" command line client by forcing a download of @@ -47,9 +47,11 @@ FILES=`git status --porcelain | echo "`echo $FILES | wc -w` files changed by 'tx'." -echo "Moving files to merge directory..." -mkdir "$MERGE_DIR" -mv -v $FILES "$MERGE_DIR" +if [ "$FILES" != "" ]; then + echo "Moving files to merge directory..." + mkdir "$MERGE_DIR" + mv -v $FILES "$MERGE_DIR" +fi echo "Restoring original .po files from Git..." git checkout . -- 2.11.4.GIT