[haiku-commits] haiku: hrev43375 - data/bin

  • From: zooey@xxxxxxxxxxxxxxx
  • To: haiku-commits@xxxxxxxxxxxxx
  • Date: Thu, 1 Dec 2011 15:46:41 +0100 (CET)

hrev43375 adds 1 changeset to branch 'master'
old head: 3032f55d28eed2c4b315454681acb1ae4bac50e7
new head: e7be020ce59cd8a50dcb9a782b3b15cfa769396c

----------------------------------------------------------------------------

1 files changed, 7 insertions(+), 4 deletions(-)
data/bin/installoptionalpackage |   11 +++++++----

############################################################################

Revision:    hrev43375
Commit:      e7be020ce59cd8a50dcb9a782b3b15cfa769396c
URL:         http://cgit.haiku-os.org/haiku/commit/?id=e7be020
Author:      Oliver Tappe <zooey@xxxxxxxxxxxxxxx>
Date:        Thu Dec  1 14:45:48 2011 UTC

Adjust GetBuildFile() to use correct cgit-URL.

----------------------------------------------------------------------------

diff --git a/data/bin/installoptionalpackage b/data/bin/installoptionalpackage
index 540ea0b..f2a22df 100755
--- a/data/bin/installoptionalpackage
+++ b/data/bin/installoptionalpackage
@@ -399,10 +399,13 @@ function GetBuildFile()
        if ! [ -f ${baseDir}/${buildfile} ] ; then
                echo "Fetching ${buildfile} ..."
                cd ${baseDir}
-               local baseURL=http://dev.haiku-os.org/export/
-               local revision=`uname -v | awk '{print $1}' | sed -e 's/r//'`
-               local 
url="${baseURL}${revision}/haiku/trunk/build/jam/${buildfile}"
-               wget -q ${url} || ErrorExit "...failed to download $buildfile"
+               local baseURL=http://cgit.haiku-os.org/haiku/plain
+               local revisionTag=`uname -v | awk '{print $1}' | sed -e 
's/-.*//'`
+                       # the sed invocation above drops potential dirty 
markers off the
+                       # revision tag
+               local url="${baseURL}/build/jam/${buildfile}?id=${revisionTag}"
+               wget -q ${url} -O ${buildfile} \
+                       || ErrorExit "...failed to download $buildfile"
        fi
 }
 


Other related posts:

  • » [haiku-commits] haiku: hrev43375 - data/bin - zooey