diff options
| author | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-04 22:11:51 -0400 |
|---|---|---|
| committer | Luke Shumaker <lukeshu@sbcglobal.net> | 2014-10-04 22:11:51 -0400 |
| commit | fd054ec1b9efe3496d567edb3b2fd36998fe60dd (patch) | |
| tree | e18865356f6d4ae1b8e6edae67c904cabe785313 | |
| parent | c85ec87841ee34c0d3fee9d753f5094c36daaf25 (diff) | |
I'm stupid, just use relative paths for librereleasev20141004.1
| -rwxr-xr-x | src/abslibre-tools/librerelease | 6 | ||||
| -rw-r--r-- | src/libretools.conf | 2 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/abslibre-tools/librerelease b/src/abslibre-tools/librerelease index 3bea33b..466ace4 100755 --- a/src/abslibre-tools/librerelease +++ b/src/abslibre-tools/librerelease @@ -225,8 +225,7 @@ release_packages() { msg "%s to upload" "$(cd "${WORKDIR}/staging" && du -hc --files0-from="$file_list" | sed -n '$s/\t.*//p')" msg "Uploading packages..." - # Use %s instead of %q so that ~home expansion is applied - xargs -0r -a "$file_list" dirname -z | ssh "${REPODEST%%:*}" "$(printf 'mkdir -p -- %s && cd %s && xargs -0r mkdir -pv --' "${REPODEST#*:}"{,})" + xargs -0r -a "$file_list" dirname -z | ssh "${REPODEST%%:*}" "$(printf 'mkdir -p -- %q && cd %q && xargs -0r mkdir -pv --' "${REPODEST#*:}"{,})" if ! rsync ${dryrun} "${rsync_flags[@]}" \ -0 --files-from="$file_list" \ "${WORKDIR}/staging" \ @@ -243,8 +242,7 @@ release_packages() { fi msg "Running db-update on repos" - # Use %s instead of %q so that ~home expansion is applied - ssh "${REPODEST%%:*}" "$(printf 'STAGING=%s dbscripts/db-update' "${REPODEST#*:}")" + ssh "${REPODEST%%:*}" "$(printf 'STAGING=%q dbscripts/db-update' "${REPODEST#*:}")" if [[ -n $HOOKPOSTRELEASE ]]; then msg "Running HOOKPOSTRELEASE..." diff --git a/src/libretools.conf b/src/libretools.conf index 2eed310..ba27232 100644 --- a/src/libretools.conf +++ b/src/libretools.conf @@ -38,7 +38,7 @@ ABSLIBREDEST="$WORKDIR/staging/abslibre" ## Where to upload packages to # '/staging/' is appended; this is for compatibility with previous versions. -REPODEST=repo@parabola.nu:~repo/staging/$LIBREUSER +REPODEST=repo@parabola.nu:staging/$LIBREUSER ## These are run before and after uploading packages HOOKPRERELEASE="ssh -fN ${REPODEST%%:*}" |