Merge branches master and bean shell, fix some bugs

build-scripts/copyto_dir.sh

@@ -0,0 +1,28 @@
+#!/bin/sh
+DIRECTORY=$(cd `dirname $0` && pwd)
+
+FTP_SITE=download.osmand.net
+FTP_FOLDER=/home/osmand/www/night-builds
+FTP_LATEST=/home/osmand/www/latest-night-build
+# FTP_USER in local.properties
+# FTP_PWD= in local.properties
+BUILD_DIR="$DIRECTORY"/builds
+LATEST_DIR="$DIRECTORY"/latests
+
+. "$DIRECTORY"/local.properties
+# 3. upload to ftp server
+#lftp -c "set net:timeout 45;open -u $FTP_USER,$FTP_PWD $FTP_SITE;mirror -R $BUILD_DIR $FTP_FOLDER;mirror -R $LATEST_DIR $FTP_LATEST"
+#rm $FTP_FOLDER/*
+#rm $FTP_LATEST/*
+cp -f $BUILD_DIR/* $FTP_FOLDER
+cp -f $LATEST_DIR/* $FTP_LATEST
+
+#ftp -n -v $FTP_SITE <<SCRIPT 2>&1
+#quote USER $FTP_USER
+#quote PASS $FTP_PWD
+#cd $FTP_FOLDER 
+#ls
+#quit
+
+
+

build-scripts/daily_build.sh

@@ -18,7 +18,10 @@ touch $LOG_FILE
 "${DIRECTORY}/build_branches.sh" 2>&1 >>$LOG_FILE
 
 # 3. upload to ftp server 
-"${DIRECTORY}/upload_ftp.sh" 2>&1 >>$LOG_FILE
+#"${DIRECTORY}/upload_ftp.sh" 2>&1 >>$LOG_FILE
+
+# 3. upload to ftp server 
+"${DIRECTORY}/copyto_dir.sh" 2>&1 >>$LOG_FILE
 
 # 4. Synchronize github with googlecode mercurial
 "${DIRECTORY}/sync_git_hg.sh" 2>&1 >>$LOG_FILE