From 5a08be6209689b70ba89eb1d1da7e30fb5ea9300 Mon Sep 17 00:00:00 2001 From: Peter Palfrader Date: Mon, 31 Mar 2014 12:27:56 +0000 Subject: And actually put to the re-publish URL too git-svn-id: svn+ssh://asteria.noreply.org/svn/weaselutils/trunk@669 bc3d92e2-beff-0310-a7cd-cc87d7ac0ede --- publish | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/publish b/publish index 9f8c4e7..67f5353 100755 --- a/publish +++ b/publish @@ -129,7 +129,6 @@ add_default_cs=0 relative="" d_server="" unpublish=0 -d_server_http_base="" while getopts "rRhnq8HSxs:t:T:u" OPTION do @@ -169,7 +168,7 @@ do relative="--relative" ;; R) - d_server_http_base=$(history_get_last_token) + d_server=$(history_get_last_token) ;; t) ttl="$OPTARG" @@ -249,7 +248,7 @@ d_date=$(date +"$date_format") d_random=$(get_random) d_server="${d_server:-$d_date$d_random}" -d_server_http_base="${d_server_http_base:-$( echo -n "$d_server" | uri_encode )}" +d_server_http_base=$( echo -n "$d_server" | uri_encode ) base_uri="$base_http/$d_server_http_base/" main_uri="$base_uri" @@ -318,7 +317,7 @@ while [ "$#" -gt 0 ]; do uri="$base_uri""$( echo -n $file | uri_encode )" fi echo "$uri" - history_append "$d_server_http_base" "$uri" + history_append "$d_server" "$uri" fi rsync_pre_invoke -- cgit v1.2.3