aboutsummaryrefslogtreecommitdiffstats
path: root/src/extras
diff options
context:
space:
mode:
authorastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2008-12-19 11:36:11 +0000
committerastokes <astokes@ef72aa8b-4018-0410-8976-d6e080ef94d8>2008-12-19 11:36:11 +0000
commit4eded2db1f1800db48f5b8ffc7f74b446d992160 (patch)
tree65b87191f7ed1cfbbf4d0175732946307deaf591 /src/extras
parent689e6540f4e6f947ea31defee444267b76abc344 (diff)
downloadsos-4eded2db1f1800db48f5b8ffc7f74b446d992160.tar.gz
resolves rhbz477042
git-svn-id: svn+ssh://svn.fedorahosted.org/svn/sos/trunk@544 ef72aa8b-4018-0410-8976-d6e080ef94d8
Diffstat (limited to 'src/extras')
-rwxr-xr-xsrc/extras/rh-upload-core31
1 files changed, 15 insertions, 16 deletions
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 <<EOF" > 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 <<EOF" > 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
}