aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJonathan McCrohan <jmccrohan@gmail.com>2012-03-13 00:59:48 +0000
committerJonathan McCrohan <jmccrohan@gmail.com>2012-03-13 00:59:48 +0000
commitef40490b47e4ffa64ffae41b43ee5096d1460ece (patch)
tree0ccb3853d28be9e96ea8b2207de489cdcff51f06 /src
parent267d9a07255d96a564da64ce5c819ebc4701d5f1 (diff)
downloadverteco-ef40490b47e4ffa64ffae41b43ee5096d1460ece.tar.gz
ftpupload: use fully qualified paths
cron requires them
Diffstat (limited to '')
-rwxr-xr-xsrc/ftpupload13
1 files changed, 10 insertions, 3 deletions
diff --git a/src/ftpupload b/src/ftpupload
index 09dfe4d..01cbdb2 100755
--- a/src/ftpupload
+++ b/src/ftpupload
@@ -20,15 +20,18 @@ FIVEDAYLOG=`/usr/bin/ftphelper --mac`"_"`date +%Y_%m_%d --date='4 days ago'`"_00
SIXDAYLOG=`/usr/bin/ftphelper --mac`"_"`date +%Y_%m_%d --date='5 days ago'`"_00_00_00.log"
SEVENDAYLOG=`/usr/bin/ftphelper --mac`"_"`date +%Y_%m_%d --date='6 days ago'`"_00_00_00.log"
+# enter modbuslog directory
+cd /var/modbuslog/
+
# move file to archive
-mv $CURRENTLOG /var/modbuslog/archive/
+/bin/mv $CURRENTLOG /var/modbuslog/archive/
# mput is dumb, and if we don't cd to the directory,
# it will try to save file to /var/modbuslog/MAC.....log on ftp remote
cd /var/modbuslog/archive/
# login to remote server and upload
-ftp -n -v -i $SERVER <<EOF
+/usr/bin/ftp -n -v -i $SERVER <<EOF
user $USERNAME $PASSWORD
cd $REMOTEDIRECTORY
mput $CURRENTLOG
@@ -41,6 +44,10 @@ mput $SEVENDAYLOG
bye
EOF
+EXITSTATUS=$?
+
# remove files after 3 months
CLEANUP="/var/modbus/archive/"`/usr/bin/ftphelper --mac`"_"`date +%Y_%m --date='4 months ago'`"*.log"
-rm $CLEANUP
+/bin/rm $CLEANUP
+
+exit $EXITSTATUS
an/1.4.8-1_exp1&id=a6e2e042f0f29de228002a9bfb5199aab1605a14&follow=1'>Update package changelog.Jonathan McCrohan1-1/+1 Bump release date. 2012-02-08Partial manual revert of move to libconfig*8.Jonathan McCrohan4-12/+12 Move back to libconfig*9, with libconfig*8-dev remaining. 2012-02-08Add my name to debian copyright.Jonathan McCrohan1-2/+3 2012-02-08Atomic commit. Rollback to libconfig8 packaging names.Jonathan McCrohan10-8/+8 2012-02-07Rename libconfig9 to libconfig8 to aid release teamJonathan McCrohan1-14/+14 2012-02-07Fix "closes typo"Jonathan McCrohan1-1/+1 2012-02-07Revert "Add symbols"Jonathan McCrohan3-739/+1 This reverts commit 5184275a78a65864e1c7c0c609f945fdb0dd2d26. 2012-02-07Revert "Fix b0rked symbol file."Jonathan McCrohan1-1/+1 This reverts commit da589e0b2ee111a61807c057cd4608b7bb278cca. 2012-02-07Revert "Second attempt"Jonathan McCrohan2-0/+194 This reverts commit 1c5de5f3d1287cdf6994bb3451b8a8e18a62b8ec. 2012-01-29Second attemptJonathan McCrohan2-194/+0 2012-01-29Fix b0rked symbol file.Jonathan McCrohan1-1/+1 2012-01-29Add symbolsJonathan McCrohan3-1/+739 2012-01-26add examples properlyJonathan McCrohan1-0/+2 2012-01-26Update changelogJonathan McCrohan1-3/+6 2012-01-26fix typoJonathan McCrohan1-1/+1 2012-01-26fix accidental description changesJonathan McCrohan1-2/+2 2012-01-26more fucking around to please lintianJonathan McCrohan1-5/+2 2012-01-25Linitan fixesJonathan McCrohan2-3/+2 2012-01-25Split out debug packagesJonathan McCrohan2-1/+6 2011-12-31Fix debian/rulesJonathan McCrohan1-1/+1 2011-12-31Remove shlibsJonathan McCrohan1-2/+0 2011-12-31Remove NMU from changelogJonathan McCrohan1-1/+0 2011-12-31Lintian FixesJonathan McCrohan1-2/+4 2011-12-31Remove Makefile patchJonathan McCrohan1-1/+0 2011-12-31Update MakefilesJonathan McCrohan10-248/+8222 2011-12-31Updated makefilesJonathan McCrohan1-0/+1