summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authoromega <marco.biasco@gmail.com>2009-04-25 22:32:02 +0200
committeromega <marco.biasco@gmail.com>2009-04-25 22:32:02 +0200
commitddac755a1b7fbecf95e6ee1e927ea0b802221b08 (patch)
treed110dfb2002071030661e1ba0bafe727fecce859
parentc64d3dd063fde12ca4e46a23f3b4d7976cd309c5 (diff)
parent4f676be8c9509b296ba09181b6daf3aea4ed8f39 (diff)
downloadscripts-ddac755a1b7fbecf95e6ee1e927ea0b802221b08.tar.gz
scripts-ddac755a1b7fbecf95e6ee1e927ea0b802221b08.tar.bz2
Merge branch 'master' of git+ssh://git.compiz-fusion.org/git/users/omega/scripts
Conflicts: git-compiz
-rwxr-xr-xgit-compiz4
1 files changed, 4 insertions, 0 deletions
diff --git a/git-compiz b/git-compiz
index 06609b0..964ba9f 100755
--- a/git-compiz
+++ b/git-compiz
@@ -436,7 +436,11 @@ else
printinfo info "${INFO_DOWNLOAD//%s/$b}";
logcmd echo
if (echo $1 | grep -q '%writeto%'); then
+<<<<<<< HEAD:git-compiz
wget -O $REALNAME -nv `echo $1 | sed 's|%writeto%.*||'`
+=======
+ wget -O `echo $1 | sed 's|.*%writeto%||'` -nv `echo $1 | sed 's|%writeto%.*||'`
+>>>>>>> 4f676be8c9509b296ba09181b6daf3aea4ed8f39:git-compiz
else
wget -nv $1
fi