Merge branch 'master' of https://git.ece.iastate.edu/danc/MicroCART_17-18

website/content/pages/documents.md

@@ -11,26 +11,7 @@ sortorder: 005
 [Design Document 1](/files/DesignDocument1.docx.pdf)
 
 ## Weekly Reports
-
-[Weekly Report 1](/files/weeklyReports/may1716_microCART_report1.pdf)
-
-[Weekly Report 2](/files/weeklyReports/may1716_microCART_report2.pdf)
-
-[Weekly Report 3](/files/weeklyReports/may1716_microCART_report3.pdf)
-
-[Weekly Report 4](/files/weeklyReports/may1716_microCART_report4.pdf)
-
-[Weekly Report 5](/files/weeklyReports/may1716_microCART_report5.pdf)
-
-[Weekly Report 6](/files/weeklyReports/may1716_microCART_report6.pdf)
-
-[Weekly Report 7](/files/weeklyReports/may1716_microCART_report7.pdf)
-
-[Weekly Report 8](/files/weeklyReports/may1716_microCART_report8.pdf)
-
-[Weekly Report 9](/files/weeklyReports/may1716_microCART_report9.pdf)
-
-[Weekly Report 10](/files/weeklyReports/may1716_microCART_report10.pdf)
+<iframe src="https://drive.google.com/embeddedfolderview?id=0BywzM7Q_7PUSeF8tdWpmMVN0eG8#list" width="100%" height="500" frameborder="0"></iframe>
 
 ## Documentation
 <iframe src="https://drive.google.com/embeddedfolderview?id=0B7xOyPfCRH4DTlZyaHZCRjN1Wmc#list" width="100%" height="500" frameborder="0"></iframe>

website/scripts/deploy.sh

@@ -21,15 +21,14 @@ fi
 PASSWORD=$(cat PASSWORD)
 
 chmod -R 755 output || exit 1
-cd output || exit 1
-
-lftp<<END_SCRIPT
-set sftp:connect-program "ssh -a -x -o PubkeyAuthentication=false"
-open sftp://$HOST
-user $USERNAME $PASSWORD
-cd www
-mirror -R --delete-first
-exit
-END_SCRIPT
+#cd output || exit 1
+
+echo "----"
+echo "sftp password (copy and paste this into the password prompt)"
+echo $PASSWORD
+echo "----"
 
-echo "Website updated."
\ No newline at end of file
+sftp -o PubkeyAuthentication=false $USERNAME@$HOST <<EOF
+put -r output/* www/
+exit
+EOF