summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJames Meyer <james.meyer@operamail.com>2010-10-27 01:51:28 (GMT)
committerJames Meyer <james.meyer@operamail.com>2010-10-27 01:51:28 (GMT)
commit9015d3a3f45be618245c8146ae6242662b21fa94 (patch)
treeae330f746f2dd9eb4bd2fab26eaced4311cc0f93
parent0e4b74030edd77bf534a7167da50c0e5c706ed14 (diff)
downloadlinhes_dev-9015d3a3f45be618245c8146ae6242662b21fa94.zip
mp: change program to use git to check for -testing
profiles: minor changes for testing local
-rwxr-xr-xbuild_tools/bin/mp22
-rw-r--r--build_tools/l7/larch0/profiles/l7/addedpacks2
-rw-r--r--build_tools/l7/larch0/profiles/l7/pacman.conf.repos11
3 files changed, 23 insertions, 12 deletions
diff --git a/build_tools/bin/mp b/build_tools/bin/mp
index 3b1992c..08d7b89 100755
--- a/build_tools/bin/mp
+++ b/build_tools/bin/mp
@@ -10,12 +10,22 @@ SRCPKGHOME=/data/pkg_repo/src_packages
mydir=`pwd`
repolist="core extra"
cmdline=$@
-if [ x`basename $0` = xmpr ]
-then
- PFIX=""
-else
- PFIX="-testing"
-fi
+
+git_branch=`git branch --no-color 2> /dev/null | sed -e '/^[^*]/d' -e 's/* \(.*\)/\1/'`
+
+case $git_branch in
+ "testing") PFIX="-testing" ;;
+ "master" ) PFIX="" ;;
+ * ) echo "can't determine which is in use";;
+ esac
+
+
+#if [ x`basename $0` = xmpr ]
+#then
+# PFIX=""
+#else
+# PFIX="-testing"
+#fi
ALL_OFF="$(tput sgr0)"
BOLD="$(tput bold)"
BLUE="${BOLD}$(tput setaf 4)"
diff --git a/build_tools/l7/larch0/profiles/l7/addedpacks b/build_tools/l7/larch0/profiles/l7/addedpacks
index d15ed91..9c26d02 100644
--- a/build_tools/l7/larch0/profiles/l7/addedpacks
+++ b/build_tools/l7/larch0/profiles/l7/addedpacks
@@ -115,7 +115,7 @@ mythgame
mythmusic
#mythphone
myththemes
-mythweather
+#mythweather
mythvideo
mythsmolt
#morethemes
diff --git a/build_tools/l7/larch0/profiles/l7/pacman.conf.repos b/build_tools/l7/larch0/profiles/l7/pacman.conf.repos
index 3fdb8f5..dc72f59 100644
--- a/build_tools/l7/larch0/profiles/l7/pacman.conf.repos
+++ b/build_tools/l7/larch0/profiles/l7/pacman.conf.repos
@@ -6,9 +6,10 @@
# You can add your own custom repositories (anywhere).
-larch: Server = ftp://ftp.berlios.de/pub/larch/larch7.2/*platform*
+#larch: Server = ftp://ftp.berlios.de/pub/larch/larch7.2/*platform*
+larch: Server = http://linhes.org/repo/larch
-core-testing: Server = http://localmirror/repo/i686/core-testing
-extra-testing: Server = http://localmirror/repo/i686/extra-testing
-#core-testing: Server = file:///data/pkg_repo/i686/core-testing
-#extra-testing: Server = file:///data/pkg_repo/i686/extra-testing
+#core-testing: Server = http://localmirror/repo/i686/core-testing
+#extra-testing: Server = http://localmirror/repo/i686/extra-testing
+core-testing: Server = file:///data/pkg_repo/i686/core-testing
+extra-testing: Server = file:///data/pkg_repo/i686/extra-testing