Merge branch 'master', remote branch 'cindyli/FLUID-4315'

* cindyli/FLUID-4315:
  FLUID-4315: Modified "infusion" setting @ image-gallery-settings.ini to have infusion as a sub-folder of image-gallery. Removed infusion path explicitly before clone to ensure its elimination.

* master:

uploader-server/build-image-gallery.sh

@@ -2,13 +2,18 @@
 
 # sets the UPLOADER_SERVER_HOME directory
 # the location where the image-gallery is checked out to
-export UPLOADER_SERVER_HOME="/home/continuum/apache-continuum-1.4.0/data/working-directory/17"
-
+export UPLOADER_SERVER_HOME="/home/continuum/apache-continuum-1.4.0/data/working-directory/$1"
 cd $UPLOADER_SERVER_HOME
+
+# change the infusion path in image gallery ini setting file
+sed 's;infusion = "../infusion";infusion = "infusion";g' image-gallery-settings.ini > image-gallery-settings.ini.new
+mv image-gallery-settings.ini.new image-gallery-settings.ini
+
 # clone infusion
- git clone https://github.com/fluid-project/infusion.git
+rm -rf infusion/
+git clone https://github.com/fluid-project/infusion.git
 
-# run the image-gallery's install script and set the location of infusion
-echo "../infusion" | bash install.sh
+# run the image-gallery's install script
+bash install.sh
 
 echo "end of script"