summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIsmael Luceno2011-06-01 01:39:07 -0300
committerIsmael Luceno2011-06-01 01:39:07 -0300
commit9683d2f17850952976ca89bb7b78e2b070f0a655 (patch)
tree1a8f2a2dfca0c731fa677130cf905742089dbcf7
parent59747676cb89f6da95e14314d7873703d124b5d4 (diff)
wmii: use hg_download
-rwxr-xr-xwindowmanagers/wmii/DOWNLOAD42
-rw-r--r--windowmanagers/wmii/HISTORY3
2 files changed, 6 insertions, 39 deletions
diff --git a/windowmanagers/wmii/DOWNLOAD b/windowmanagers/wmii/DOWNLOAD
index 4fce9e75e7..8f67500d70 100755
--- a/windowmanagers/wmii/DOWNLOAD
+++ b/windowmanagers/wmii/DOWNLOAD
@@ -1,44 +1,8 @@
#once the hg download handler hits stable sorcery this DOWNLOAD script would
#only need to be removed, SOURCE_URL is compatible with the planned hg handler
-function my_url_hg_http_crack() {
-
- URL=$(url_strip_prefix "$1" hg_http)
- HG_ROOT=$(echo $URL | sed "s#\(^[^/]*[^:]*\):.*#\1#")
- HG_ROOT=http://$HG_ROOT
- local HG_DIRECTORY_TAG=$(echo $URL | sed "s#^[^/]*[^:]*\(.*\)#\1#")
- HG_DIRECTORY=$(echo $HG_DIRECTORY_TAG | cut -d : -f2)
- local HG_TAGNAME=$(echo $HG_DIRECTORY_TAG | cut -d : -f3)
- HG_TAG=${HG_TAGNAME:=default}
-
-}
if [[ $WMII_RELEASE != "SCM version" ]]; then
- default_download &&
- return $?
-fi &&
-
-message "${MESSAGE_COLOR}Starting Mercurial checkout of" \
- "${FILE_COLOR}${SOURCE}${MESSAGE_COLOR}...${DEFAULT_COLOR}" &&
-my_url_hg_http_crack $SOURCE_URL &&
-if [[ -f $SOURCE_CACHE/$SOURCE ]]; then
- message "${MESSAGE_COLOR}Previous source found unpacking...${DEFAULT_COLOR}" &&
- tar -jxf $SOURCE_CACHE/$SOURCE &&
- message "${MESSAGE_COLOR}Running hg pull...${DEFAULT_COLOR}" &&
- ( cd $HG_DIRECTORY &&
- echo hg pull $HG_ROOT &&
- hg pull $HG_ROOT &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
+ default_download
else
- message "${MESSAGE_COLOR}Running hg clone...${DEFAULT_COLOR}"
- echo hg clone $HG_ROOT $HG_DIRECTORY
- hg clone $HG_ROOT $HG_DIRECTORY &&
- ( cd $HG_DIRECTORY &&
- echo hg update $HG_TAG &&
- hg update $HG_TAG )
-fi &&
-message "${MESSAGE_COLOR}Generating tarball...${DEFAULT_COLOR}" &&
-tar -jcf $SOURCE $HG_DIRECTORY &&
-cp $SOURCE $SOURCE_CACHE/$SOURCE &&
-rm $SOURCE &&
-message "${MESSAGE_COLOR}Mercurial checkout complete...${DEFAULT_COLOR}"
+ hg_download
+fi
diff --git a/windowmanagers/wmii/HISTORY b/windowmanagers/wmii/HISTORY
index 17dd2b0201..7fba73377b 100644
--- a/windowmanagers/wmii/HISTORY
+++ b/windowmanagers/wmii/HISTORY
@@ -1,3 +1,6 @@
+2011-06-01 Ismael Luceno <ismael@sourcemage.org>
+ * DOWNLOAD: use hg_download
+
2011-05-20 Sukneet Basuta <sukneet@sourcemage.org>
* DETAILS: fixed checking for SCM version