[Armadeus-commitlog] armadeus branch, master, updated. armadeus-5.3-558-gef2dcf8
Brought to you by:
sszy
|
From: Sébastien S. <ss...@us...> - 2015-01-19 13:29:11
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via ef2dcf842181edb678f6d05ba09a4419e735a9b7 (commit)
from 805805ea1f7e79f08b40aabd89cc69db3b45ffe5 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit ef2dcf842181edb678f6d05ba09a4419e735a9b7
Author: Sébastien Szymanski <seb...@ar...>
Date: Mon Jan 19 14:31:35 2015 +0100
[SCRIPT] quiltify.sh: do not try to delete or remove target dir if
it does not exist.
Does it properly this time... :)
-----------------------------------------------------------------------
Summary of changes:
scripts/quiltify.sh | 24 +++++++++++++-----------
1 files changed, 13 insertions(+), 11 deletions(-)
diff --git a/scripts/quiltify.sh b/scripts/quiltify.sh
index aab7b69..5329d1f 100755
--- a/scripts/quiltify.sh
+++ b/scripts/quiltify.sh
@@ -143,17 +143,19 @@ if [ "$answer" == "y" ] || [ "$answer" == "yes" ]; then
fi
# Move or delete current XXX dir
-if [ "$QUILT_TARGET_NAME" != "Buildroot" ] && [ -e "$QUILT_TARGET_DIR" ]; then
- ask_user "Rename or delete the current $QUILT_TARGET_NAME directory: $QUILT_TARGET_DIR \n?? (R/d)"
- EXT=`date +%Y_%m_%d_%Hh%M`
- if [ "$answer" == "d" ]; then
- echo -n "Deleting current $QUILT_TARGET_NAME dir..."
- rm -rf $QUILT_TARGET_DIR
- echo "done"
- else
- echo "Renaming $QUILT_TARGET_DIR"
- echo " to " "$QUILT_TARGET_DIR"."$EXT"
- mv $QUILT_TARGET_DIR "$QUILT_TARGET_DIR"."$EXT"
+if [ "$QUILT_TARGET_NAME" != "Buildroot" ]; then
+ if [ -d "$QUILT_TARGET_DIR" ]; then
+ ask_user "Rename or delete the current $QUILT_TARGET_NAME directory: $QUILT_TARGET_DIR \n?? (R/d)"
+ EXT=`date +%Y_%m_%d_%Hh%M`
+ if [ "$answer" == "d" ]; then
+ echo -n "Deleting current $QUILT_TARGET_NAME dir..."
+ rm -rf $QUILT_TARGET_DIR
+ echo "done"
+ else
+ echo "Renaming $QUILT_TARGET_DIR"
+ echo " to " "$QUILT_TARGET_DIR"."$EXT"
+ mv $QUILT_TARGET_DIR "$QUILT_TARGET_DIR"."$EXT"
+ fi
fi
else # For Buildroot
rm -f $QUILT_TARGET_DIR/.patched
hooks/post-receive
--
armadeus
|