summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoromega <marco.biasco@gmail.com>2009-04-04 20:42:40 +0200
committeromega <marco.biasco@gmail.com>2009-04-04 20:42:40 +0200
commit4613209d6f9cbaa22fbb4f3392621088554449c9 (patch)
tree7ea70b331585e86949a912af2c0de5f0cceabac7
parentc80b190188db99ca1c0d9050f978954d50b744d7 (diff)
downloadscripts-4613209d6f9cbaa22fbb4f3392621088554449c9.tar.gz
scripts-4613209d6f9cbaa22fbb4f3392621088554449c9.tar.bz2
Fixed --skip-update
-rwxr-xr-xgit-compiz4
1 files changed, 3 insertions, 1 deletions
diff --git a/git-compiz b/git-compiz
index 9f1c6eb..41f581a 100755
--- a/git-compiz
+++ b/git-compiz
@@ -408,6 +408,8 @@ if [ -d $b -o -d $b-http ]; then
printinfo info "${INFO_UNDO//%s/$b}";
logcmd echo
git reset --hard HEAD^ &>/dev/null
+ test=1
+ else test=0
fi
cd $here
else
@@ -609,7 +611,7 @@ build_wrapper()
{
CPWD=$PWD
# Check if we are going to skip this...
-if [ "$SKIP_INSTALL" == "true" -o $test -ne 1 ] && [ $FORCE_REBUILT != "true" \
+if [ "$SKIP_INSTALL" == "true" -o $test -ne 1 ] && [ "$FORCE_REBUILT" != "true" \
-a -z "`(for dir in $FORCE_REBUILT; do [ $dir != $1 ] || echo "yes"; done) | grep yes`" ]; then
printinfo info "${INFO_SKIP//%s/$1}";
logcmd echo