diff options
| author | Ismael Luceno | 2011-06-01 00:58:12 -0300 |
|---|---|---|
| committer | Ismael Luceno | 2011-06-01 00:58:12 -0300 |
| commit | 7b6f873c7feac1d7fba2e49f2877eae527579424 (patch) | |
| tree | c1487c169255c0018c8b405209a7d5f2616c2037 | |
| parent | a852318435c40b3bc90293529fde33a7b84f712f (diff) | |
libnfo: use hg_download
| -rwxr-xr-x | libs/libnfo/DOWNLOAD | 43 | ||||
| -rw-r--r-- | libs/libnfo/HISTORY | 3 |
2 files changed, 6 insertions, 40 deletions
diff --git a/libs/libnfo/DOWNLOAD b/libs/libnfo/DOWNLOAD index 21418465b4..24a9860536 100755 --- a/libs/libnfo/DOWNLOAD +++ b/libs/libnfo/DOWNLOAD @@ -1,45 +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 [[ "${VERSION}" != "mercurial" && "${VERSION}" != "$(date +%Y%m%d)" ]]; 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/libs/libnfo/HISTORY b/libs/libnfo/HISTORY index 0cbb0555a5..0abead67fe 100644 --- a/libs/libnfo/HISTORY +++ b/libs/libnfo/HISTORY @@ -1,3 +1,6 @@ +2011-06-01 Ismael Luceno <ismael@sourcemage.org> + * DOWNLOAD: use hg_download + 2010-03-03 Philippe "Puppet_Master" Caseiro <puppetmaster@sourcemage.org> * DOWNLOAD: fixing version test 'scm -> mercurial' |