diff options
| author | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-01 23:32:50 -0600 |
|---|---|---|
| committer | Luke Shumaker <LukeShu@sbcglobal.net> | 2013-06-05 20:01:06 -0600 |
| commit | 7c741c5c1b0253d87a925927cb74ff3d329aa16a (patch) | |
| tree | 928c346d7f92a7f578c5a05b99d511a8616741f4 | |
| parent | 1165c8ebce0eea97a62b82560f889b978a40a8b2 (diff) | |
librerelease: use a single REPODEST instead of PARABOLAHOST + LIBREDESTDIR
| -rwxr-xr-x | src/abslibre-tools/librerelease | 6 | ||||
| -rw-r--r-- | src/libretools.conf | 21 |
2 files changed, 11 insertions, 16 deletions
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 540472c..59983d2 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -153,7 +153,7 @@ function main { load_files makepkg check_vars makepkg GPGKEY load_files libretools - check_vars libretools WORKDIR PARABOLAHOST LIBREDESTDIR || return 1 + check_vars libretools WORKDIR REPODEST || return 1 # The following variables are actually optional #check_vars libretools HOOKPRERELEASE HOOKPOSTRELEASE || return 1 @@ -186,7 +186,7 @@ function release_packages { --progress \ -e "ssh " \ ${WORKDIR}/staging \ - ${PARABOLAHOST}:${LIBREDESTDIR}/ + ${REPODEST}/ then error "Sync failed, try again" return 1 @@ -195,7 +195,7 @@ function release_packages { clean msg "Running db-update on repos" - ssh ${PARABOLAHOST} dbscripts/db-update + ssh ${REPODEST%%:*} dbscripts/db-update [[ ! -z ${HOOKPOSTRELEASE} ]] && bash -c "${HOOKPOSTRELEASE}" diff --git a/src/libretools.conf b/src/libretools.conf index 24d6ca6..2c7ccdd 100644 --- a/src/libretools.conf +++ b/src/libretools.conf @@ -26,20 +26,15 @@ REPOS=('core' 'libre' 'extra' 'community' 'libre-testing' 'social' 'sugar' 'pcr' # The dir where you work on WORKDIR=/home/$LIBREUSER/packages -## Parabola hostname -PARABOLAHOST=parabola -## Assumes something similar in your .ssh/config: - -## Repo server -# Host parabola -# Port 1863 -# HostName repo.parabolagnulinux.org -# User repo - -## Server destination of libre packages +## Where to upload packages to # Don't change unless you know what you're doing and you won't screw # anything ;) -LIBREDESTDIR=/srv/http/repo/public +REPODEST=repo@repo:/srv/http/repo/public +## Assumes something similar in your .ssh/config: + +# Host repo +# Port 1863 +# HostName repo.parabolagnulinux.org ## ABSLibre ABSLIBREGIT=http://projects.parabolagnulinux.org/abslibre.git @@ -47,7 +42,7 @@ ABSLIBREGIT=http://projects.parabolagnulinux.org/abslibre.git # Run a command before releasing a package (ie. SSH connection, SSH tunnel, etc.) # This is called by librerelease. -HOOKPRERELEASE="ssh -fN ${PARABOLAHOST}" +HOOKPRERELEASE="ssh -fN ${REPODEST%%:*}" HOOKPOSTRELEASE="sudo librechroot clean-repo" ################################################################################ |