summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rwxr-xr-xbuild-repo.sh2
-rwxr-xr-xxibuild7
2 files changed, 5 insertions, 4 deletions
diff --git a/build-repo.sh b/build-repo.sh
index c3dd2b0..6cfc416 100755
--- a/build-repo.sh
+++ b/build-repo.sh
@@ -9,7 +9,7 @@ fetch () {
}
build () {
- for REPO in $(du -h xipkgs/repo/* | awk '{print $2}'); do
+ for REPO in $(du -h xipkgs/repo/* | awk '{print $2}' | sort -r); do
REPO_NAME=$(echo $REPO | cut -d"/" -f2-)
REPO_INDEX=dist/$REPO_NAME/index.html
diff --git a/xibuild b/xibuild
index 06fecb8..d16ad41 100755
--- a/xibuild
+++ b/xibuild
@@ -57,6 +57,7 @@ xibuild () {
echo "Passing missing package stage"
}
+ BRANCH=HEAD
source $BUILD_FILE
@@ -88,7 +89,7 @@ xibuild () {
# try get the commit hash for the package
if git ls-remote -q $SOURCE &> /dev/null; then
- VER_HASH=$(git ls-remote $SOURCE HEAD )
+ VER_HASH=$(git ls-remote $SOURCE $BRANCH )
else
VER_HASH=$(curl -Ls $SOURCE | md5sum)
fi
@@ -112,8 +113,9 @@ xibuild () {
fi
printf "$INFO\tfetching package...";
- if git ls-remote -q $SOURCE &> /dev/null; then
+ if git ls-remote -q $SOURCE $BRANCH &> /dev/null; then
git clone $SOURCE . >> $LOGFILE 2>&1 && printf "$PASS fetched $(du -sh $PKG_BUILD_DIR | awk '{ print $1 }') source\n" || return 1;
+ git checkout $BRANCH >> $LOGFILE 2>&1
else
DOWNLOADED=$(basename $SOURCE)
curl -Ls $SOURCE > $DOWNLOADED
@@ -221,4 +223,3 @@ if [ $# -gt 0 ]; then
else
usage; return 1
fi
-