summaryrefslogtreecommitdiff
path: root/branches
diff options
context:
space:
mode:
authoromega <marco.biasco@gmail.com>2009-04-04 19:27:13 +0200
committeromega <marco.biasco@gmail.com>2009-04-04 19:27:13 +0200
commitc80b190188db99ca1c0d9050f978954d50b744d7 (patch)
tree57c38a46e68753d4d9879383b4c8b9568f39469c /branches
parentfd4a5029868bfd75522c16b9be702722dedf1bea (diff)
downloadscripts-c80b190188db99ca1c0d9050f978954d50b744d7.tar.gz
scripts-c80b190188db99ca1c0d9050f978954d50b744d7.tar.bz2
Fixed branch
Diffstat (limited to 'branches')
-rw-r--r--branches/compiz-0.811
-rw-r--r--branches/compiz-0.99
2 files changed, 4 insertions, 16 deletions
diff --git a/branches/compiz-0.8 b/branches/compiz-0.8
index 59ed499..1eafe82 100644
--- a/branches/compiz-0.8
+++ b/branches/compiz-0.8
@@ -3,16 +3,9 @@
# This is a highly documented example to be compied for making new branches
# Best to define all branches at the top
-CORE="compiz-0.8"
-FUSION="compiz-0.8"
+COMP_BRANCH="compiz-0.8"
# Here we have our statements
# CURRENT_ITEM is a variable provided by git-compiz to show what we are
# handling
-# In this situation, check if we are on core, if we are, the branch is
-# compiz-0.8, otherwise it is 0.8
-if ( echo $CURRENT_ITEM | grep -e compiz -e core &>/dev/null); then
- GIT_BRANCH=origin/$CORE
-else
- GIT_BRANCH=origin/$FUSION
-fi
+GIT_BRANCH=origin/$COMP_BRANCH
diff --git a/branches/compiz-0.9 b/branches/compiz-0.9
index 40487df..0c282f8 100644
--- a/branches/compiz-0.9
+++ b/branches/compiz-0.9
@@ -1,9 +1,4 @@
## COMPIZ-0.9 CONFIG FILE FOR GIT-COMPIZ
-CORE="HEAD"
-FUSION="compiz++"
+COMP_BRANCH="HEAD"
-if ( echo $CURRENT_ITEM | grep core &>/dev/null ); then
- GIT_BRANCH=origin/$CORE
-else
- GIT_BRANCH=origin/$FUSION
-fi
+GIT_BRANCH=origin/$COMP_BRANCH