diff iReport.sh @ 1:d582e2cd3e13 draft

Uploaded

--- a/iReport.sh	Thu Feb 26 14:05:23 2015 +0100
+++ b/iReport.sh	Wed Jul 15 08:52:21 2015 -0400
@@ -35,14 +35,23 @@
 source "${repositorypath}/createHTML.sh"
 mkdir $galaxypath
 
-tabs=${tabs//,/ }; tabs=${tabs/ /}
+#tabs=${tabs//,/ }; tabs=${tabs/ /}
+#tabs=${tabs//==dollar==/$}
+#tabs=${tabs//==braceopen==/(}
+#tabs=${tabs//==braceclose==/)}
 gbtracks=${gbtracks:1}
 items=${items//,/ }; items=${items/ /}
+
+title=${title//--/}
+title=${title//label/}
+title=${title// /}
+
 echo -e "title:      $title"
+echo -n "$title" > tmpfileb64
+title=`base64 -d tmpfileb64`
+echo -e "title decoded:      $title"
 
 #title=${title%--*}
-title=${title//--/}
-title=${title//label/}
 
 reportname=${title// /}
 
@@ -61,22 +70,24 @@
 	echo "tabname: $i" 
 done
 
-coverimage=${coverimage:1}
-echo -e "coverimage2: $coverimage"
+
 
 #if no coverimage provided, use default EMC logo
-if [[ -z $coverimage ]] 
+if [[ $coverimage == "-" ]] 
 then
 	cp $repositorypath/intro.jpg ${galaxypath}/intro.jpg
 	coverimage="intro.jpg" 
+else
+	coverimage=${coverimage:1}
+	echo -n "$coverimage" > tmpfileb64
+	coverimage=`base64 -d tmpfileb64`
 fi
-echo -e "coverimage3: $coverimage"
 
 ## Copy supporting files from repository to output directory
 cp ${repositorypath}/jquery.dataTables.css ${galaxypath}/jquery.dataTables.css
 cp ${repositorypath}/jquery.dataTables.js ${galaxypath}/jquery.dataTables.js
-cp -R ${repositorypath}/iframe-resizer/ ${galaxypath}/iframe-resizer/
-cp -R ${repositorypath}/DataTables-1.9.4/ ${galaxypath}/DataTables-1.9.4/
+cp -R ${repositorypath}/iframe-resizer/ ${galaxypath}/iframe-resizer/ > /dev/null 2>&1
+cp -R ${repositorypath}/DataTables-1.9.4/ ${galaxypath}/DataTables-1.9.4/ > /dev/null 2>&1
 cp ${repositorypath}/jquery.zoom.js ${galaxypath}/jquery.zoom.js
 cp ${repositorypath}/jquery-ui.css ${galaxypath}/jquery-ui.css
 cp ${repositorypath}/jquery-1.10.2.js ${galaxypath}/jquery-1.10.2.js
@@ -103,7 +114,7 @@
 ## Create zip file of this iReport for download by user
 wd=`pwd`
 cd ${galaxypath}
-zip -r iReport_${reportname} .
+zip -r iReport_${reportname} . > /dev/null 2>&1
 cd $wd
 
 wait
\ No newline at end of file