Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=e63621a846e8fc64567f033ba62b884c02fe0778
commit e63621a846e8fc64567f033ba62b884c02fe0778 Author: crazy <[email protected]> Date: Mon Dec 12 17:19:28 2016 +0100 github.sh .. try to fix this mess * ohh well :) * removed all these mad checks on tag/tag_v ( partialy proken anyway.. ) * add a full_source_name witch only differs on tag_v sice it has a v in it * set all source to archive since everything is there tag, tag_v , normal tarballs * set up2date to releases/latest since it will print all tarballs * some other fixes .. * added fixme for scm && devel option diff --git a/source/apps-extra/sshfs-fuse/FrugalBuild b/source/apps-extra/sshfs-fuse/FrugalBuild deleted file mode 100644 index 286a539..0000000 --- a/source/apps-extra/sshfs-fuse/FrugalBuild +++ /dev/null @@ -1,24 +0,0 @@ -# Compiling Time: 0.01 SBU -# Maintainer: Miklos Vajna <[email protected]> - -pkgname=sshfs-fuse -pkgver=2.5 -pkgrel=1 -pkgdesc="A filesystem client based on the SSH File Transfer Protocol." -depends=('fuse' 'glib2') -groups=('apps-extra') -replaces=('shfs') -archs=('i686' 'x86_64') -_F_sourceforge_dirname="fuse" -Finclude sourceforge -url="http://fuse.sourceforge.net/sshfs.html"; -sha1sums=('a28ed6c04847611816452441b14ad9a0bb6df842') - -build() -{ - [ "$CARCH" == "x86_64" ] && CFLAGS="$CFLAGS -fPIC" - Fsed '$(CC)' '$(CC) $(CFLAGS)' Makefile.am - Fbuild -} - -# optimization OK diff --git a/source/include/github.sh b/source/include/github.sh index 3c993ee..9d71178 100644 --- a/source/include/github.sh +++ b/source/include/github.sh @@ -41,24 +41,24 @@ ### if [ -z "$_F_github_name" ]; then - _F_github_name=$pkgname + _F_github_name="$pkgname" fi if [ -z "$_F_github_dirname" ]; then - _F_github_dirname=$_F_github_name + _F_github_dirname="$_F_github_name" fi if [ -z "$_F_github_ver" ]; then - _F_github_ver=$pkgver + _F_github_ver="$pkgver" fi if [ -z "$_F_github_author" ]; then - _F_github_author=$_F_github_name + _F_github_author="$_F_github_name" fi if [ -z "$_F_github_ext" ] ; then - _F_github_ext=.tar.gz + _F_github_ext=".tar.gz" fi if [ -z "$_F_github_sep" ]; then @@ -69,22 +69,23 @@ if [ -z "$url" ]; then url=https://github.com/$_F_github_author/$_F_github_name fi -if [ -z "$_F_github_tag" ] && [ -z "$_F_github_tag_v" ]; then - _F_github_up2date="downloads" - _F_github_source="https://github.com/downloads/$_F_github_author/$_F_github_dirname/$_F_github_name$_F_github_sep$_F_github_ver$_F_github_ext"; +## set source to archive .. seems to be fine. +## releases , tags and tags_v are all under archive + +## same for up2date + + +if [ -z "$_F_github_tag_v" ]; then + _F_github_full_archive_name="${_F_github_name}${_F_github_sep}${_F_github_ver}${_F_github_ext}" else - _F_github_up2date="releases/latest" - _F_archive_name="archive" - Fpkgversep="/" - if [ -z "$_F_github_tag_v" ]; then - _F_github_source="https://github.com/$_F_github_author/$_F_github_dirname/archive/$_F_github_ver$_F_github_ext"; - else - _F_github_source="https://github.com/$_F_github_author/$_F_github_dirname/archive/v$_F_github_ver$_F_github_ext"; - fi - _F_cd_path="$_F_github_name-$_F_github_ver" + _F_github_full_archive_name="v${_F_github_name}${_F_github_sep}${_F_github_ver}${_F_github_ext}" fi +_F_github_source="https://github.com/$_F_github_author/$_F_github_dirname/archive/${_F_github_full_archive_name}"; +_F_github_up2date="releases/latest" + +## fixme ? if [ "$_F_github_devel" = "yes" ]; then # Not checked, but may work. _F_scm_type=git @@ -92,10 +93,12 @@ if [ "$_F_github_devel" = "yes" ]; then Finclude scm else if [ -z "$_F_github_tag_v" ]; then - up2date="Flastarchive https://github.com/$_F_github_author/$_F_github_dirname/$_F_github_up2date $_F_github_ext" + up2date="Flastarchive https://github.com/${_F_github_author}/${_F_github_dirname}/${_F_github_up2date} ${_F_github_ext}" else - up2date="Flastarchive https://github.com/$_F_github_author/$_F_github_dirname/$_F_github_up2date $_F_github_ext | sed 's/v//'" + up2date="Flastarchive https://github.com/${_F_github_author}/${_F_github_dirname}/${_F_github_up2date} ${_F_github_ext} | sed 's/v//'" fi - # On one line for Mr Portability, Hermier Portability. - source=(${source[@]} ${_F_github_source}) fi + +# On one line for Mr Portability, Hermier Portability. +source+=("${_F_github_source}") + _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
