adjust build scripts for the new server and newer git
This commit is contained in:
parent
dcfcec3153
commit
8901474c67
2 changed files with 3 additions and 3 deletions
|
@ -32,7 +32,7 @@ do
|
||||||
## reset all previous changes in working tree
|
## reset all previous changes in working tree
|
||||||
git checkout .
|
git checkout .
|
||||||
git reset HEAD --hard
|
git reset HEAD --hard
|
||||||
git checkout $BRANCH
|
git checkout -f $BRANCH
|
||||||
git reset $GIT_ORIGIN_NAME/$BRANCH --hard
|
git reset $GIT_ORIGIN_NAME/$BRANCH --hard
|
||||||
sed -e "s/\(APP_DESCRIPTION.*=.*\"\).*\(\".*\)/\1$SHORT_DATE $BRANCH\2/g" $VERSION_FILE > ${VERSION_FILE}.bak
|
sed -e "s/\(APP_DESCRIPTION.*=.*\"\).*\(\".*\)/\1$SHORT_DATE $BRANCH\2/g" $VERSION_FILE > ${VERSION_FILE}.bak
|
||||||
mv ${VERSION_FILE}.bak ${VERSION_FILE}
|
mv ${VERSION_FILE}.bak ${VERSION_FILE}
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
DIRECTORY=$(cd `dirname $0` && pwd)
|
DIRECTORY=$(cd `dirname $0` && pwd)
|
||||||
|
|
||||||
FTP_SITE=download.osmand.net
|
FTP_SITE=download.osmand.net
|
||||||
FTP_FOLDER=/home/osmand/www/night-builds
|
FTP_FOLDER=/var/www-download/night-builds
|
||||||
FTP_LATEST=/home/osmand/www/latest-night-build
|
FTP_LATEST=/var/www-download/latest-night-build
|
||||||
# FTP_USER in local.properties
|
# FTP_USER in local.properties
|
||||||
# FTP_PWD= in local.properties
|
# FTP_PWD= in local.properties
|
||||||
BUILD_DIR="$DIRECTORY"/builds
|
BUILD_DIR="$DIRECTORY"/builds
|
||||||
|
|
Loading…
Reference in a new issue