From 4eded2db1f1800db48f5b8ffc7f74b446d992160 Mon Sep 17 00:00:00 2001 From: astokes Date: Fri, 19 Dec 2008 11:36:11 +0000 Subject: resolves rhbz477042 git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@544 ef72aa8b-4018-0410-8976-d6e080ef94d8 --- src/extras/rh-upload-core | 31 +++++++++++++++---------------- 1 file changed, 15 insertions(+), 16 deletions(-) (limited to 'src/extras/rh-upload-core') diff --git a/src/extras/rh-upload-core b/src/extras/rh-upload-core index 8240dd96..4bea9478 100755 --- a/src/extras/rh-upload-core +++ b/src/extras/rh-upload-core @@ -21,7 +21,7 @@ umask 0077 ## Declare some variables date=`/bin/date -u +%G%m%d%k%M%S | /usr/bin/tr -d ' '` -destination="dropbox.redhat.com" +destination="dropbox.redhat.com/incoming" NOUPLOAD=NO SPLIT=0 @@ -248,24 +248,23 @@ if [ "$NOUPLOAD" = "yes" ]; then echo "to be uploaded to your target system manually. The information indicated above" echo "will still be provided." echo - else - if [ ! /usr/bin/lftp ]; then + fi + if [ ! /usr/bin/lftp ]; then # No lftp installed echo "lftp could not be found in /usr/bin. The file(s) will need to be uploaded manually." - else - # Make the lftp script first - echo "lftp $destination < lftp_scripts - if [ "$SPLIT" = "yes" ]; then - echo "lcd $ticket_number" >> lftp_scripts - echo "mirror -R" >> lftp_scripts - else - echo "put $new_file" >> lftp_scripts - fi - echo "quit 0" >> lftp_scripts - echo "EOF" >> lftp_scripts - /usr/bin/lftp -f lftp_scripts - fi + else + # Make the lftp script first + echo "lftp $destination < lftp_scripts + if [ "$SPLIT" = "yes" ]; then + echo "lcd $ticket_number" >> lftp_scripts + echo "mirror -R" >> lftp_scripts + else + echo "put $new_file" >> lftp_scripts + fi + echo "quit 0" >> lftp_scripts + echo "EOF" >> lftp_scripts + /usr/bin/lftp -f lftp_scripts fi fi } -- cgit