diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-14 16:11:14 -0500 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2012-11-14 16:11:14 -0500 |
| commit | 203be310b0810da95a73ee7d333f0da7c9a07acf (patch) | |
| tree | 6dbe73c5ed546cad80112d43bdb8a4128c1da341 | |
| parent | 7a75a6e8f80f8f75cf4b153da6f0ef8139019420 (diff) | |
update libre/parabolaweb-utils: make GITURL and GITREF configurable
| -rw-r--r-- | libre/parabolaweb-utils/PKGBUILD | 12 | ||||
| -rw-r--r-- | libre/parabolaweb-utils/parabolaweb-download | 14 | ||||
| -rw-r--r-- | libre/parabolaweb-utils/parabolaweb.conf | 2 |
3 files changed, 16 insertions, 12 deletions
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD index e0b70ba1a..5000e0201 100644 --- a/libre/parabolaweb-utils/PKGBUILD +++ b/libre/parabolaweb-utils/PKGBUILD @@ -8,7 +8,7 @@ pkgname=parabolaweb-utils pkgver=`_get_pkgver` -pkgrel=5 +pkgrel=6 pkgdesc="Utils for the Parabola website" arch=('any') url="https://projects.parabolagnulinux.org/parabolaweb.git/" @@ -17,13 +17,15 @@ depends=( 'python2' # duh 'python2-flup' # for fcgi 'postgresql' # for database - 'git' # used in parabolaweb-update - 'libretools' # used in parabolaweb-update + 'git' # used in parabolaweb-download + 'libretools' # used in parabolaweb-{download,update} `_get_depends`) backup=('etc/conf.d/parabolaweb') export pkgver +makedepends=(makepkg-git) + source=(git://parabolagnulinux.org/parabolaweb.git parabolaweb-download parabolaweb-update @@ -47,9 +49,9 @@ package() { } md5sums=('SKIP' - '01bed679a4fd768e720bfd0f3c7d6694' + 'f162c2ce49b4cafe0a14bd4767dfea04' 'a73063b14746720b77fdbab851f5c161' 'd5294495f42df29d29519ebd0a8f6093' 'cc15e153f99fba82e7bb032896f655c2' 'a468016a7155b5da46521dcfc6428384' - '9b565ef07e44d395bf7a0e484e3d19d1') + 'ffd37a19b1a72fbac2c58504aa17b355') diff --git a/libre/parabolaweb-utils/parabolaweb-download b/libre/parabolaweb-utils/parabolaweb-download index 823a18811..e124295d4 100644 --- a/libre/parabolaweb-utils/parabolaweb-download +++ b/libre/parabolaweb-utils/parabolaweb-download @@ -4,8 +4,8 @@ . /usr/bin/libremessages dir=$WEBDIR -repo=git://parabolagnulinux.org/parabolaweb.git -ref=master +repo=$GITURL +ref=$GITREF cd_safe() { if ! cd "$1"; then @@ -26,11 +26,11 @@ download_git() { else cd_safe "$dir" # Make sure we are fetching the right repo - # if [[ "$repo" != "$(git config --get remote.origin.url)" ]] ; then - # error "$(gettext "%s is not a clone of %s")" "$dir" "$repo" - # plain "$(gettext "Aborting...")" - # exit 1 - # fi + if [[ "$repo" != "$(git config --get remote.origin.url)" ]] ; then + error "$(gettext "%s is not a clone of %s")" "$dir" "$repo" + plain "$(gettext "Aborting...")" + exit 1 + fi msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git" if ! git pull origin "$ref"; then # only warn on failure to allow offline builds diff --git a/libre/parabolaweb-utils/parabolaweb.conf b/libre/parabolaweb-utils/parabolaweb.conf index 467e62e2c..5363479b3 100644 --- a/libre/parabolaweb-utils/parabolaweb.conf +++ b/libre/parabolaweb-utils/parabolaweb.conf @@ -2,3 +2,5 @@ HOST=127.0.0.1 PORT=8090 # 80 is nginx WEBDIR=/srv/http/web WEBUSER=nobody +GITURL=git://parabolagnulinux.org/parabolaweb.git +GITREF=master |