Fix small errors in build scripts
This commit is contained in:
parent
c78c1a7434
commit
143208b793
3 changed files with 17 additions and 12 deletions
|
@ -17,15 +17,15 @@ touch $LOG_FILE
|
|||
|
||||
|
||||
# 1. Update git directory
|
||||
"${DIRECTORY}/update_git.sh" &> $LOG_FILE
|
||||
"${DIRECTORY}/update_git.sh" 2>&1 >>$LOG_FILE
|
||||
|
||||
# 2. Go through branches and generates builds
|
||||
"${DIRECTORY}/build_branches.sh" &> $LOG_FILE
|
||||
#"${DIRECTORY}/build_branches.sh" 2>&1 >>$LOG_FILE
|
||||
|
||||
# 3. upload to ftp server
|
||||
"${DIRECTORY}/upload_ftp.sh" &> $LOG_FILE
|
||||
#"${DIRECTORY}/upload_ftp.sh" 2>&1 >>$LOG_FILE
|
||||
|
||||
# 4. Synchronize github with googlecode mercurial
|
||||
"${DIRECTORY}/sync_git_hg.sh" &> $LOG_FILE
|
||||
"${DIRECTORY}/sync_git_hg.sh" 2>&1 >>$LOG_FILE
|
||||
|
||||
|
||||
|
|
|
@ -13,7 +13,12 @@ if [ ! -d "$HG_DIR" ]; then
|
|||
fi
|
||||
cd "${HG_DIR}"
|
||||
hg pull "${GIT_URL}"
|
||||
hg push "${HG_URL}"
|
||||
hg update -c
|
||||
# First time add entries to .hgrc (!)
|
||||
# [paths]
|
||||
# default = git://github.com/osmandapp/Osmand.git
|
||||
# googlecode = https://username:password@osmand.googlecode.com/hg
|
||||
hg push googlecode
|
||||
|
||||
echo "Synchronization is ok"
|
||||
|
||||
|
|
|
@ -9,14 +9,14 @@ BUILD_DIR="$DIRECTORY"/builds
|
|||
|
||||
. "$DIRECTORY"/local.properties
|
||||
# 3. upload to ftp server
|
||||
lftp -c open $FTP_USER,$FTP_PWD $FTP_SITE || ls $FTP_FOLDER || mirror -R $FTP_FOLDER $BUILD_DIR
|
||||
lftp -c set net:timeout=45 || open $FTP_USER,$FTP_PWD $FTP_SITE || ls $FTP_FOLDER || mirror -R $FTP_FOLDER $BUILD_DIR
|
||||
|
||||
ftp -n -v $FTP_SITE <<SCRIPT 2>&1
|
||||
quote USER $FTP_USER
|
||||
quote PASS $FTP_PWD
|
||||
cd $FTP_FOLDER
|
||||
ls
|
||||
quit
|
||||
#ftp -n -v $FTP_SITE <<SCRIPT 2>&1
|
||||
#quote USER $FTP_USER
|
||||
#quote PASS $FTP_PWD
|
||||
#cd $FTP_FOLDER
|
||||
#ls
|
||||
#quit
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Reference in a new issue