Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'master' of git@github.com:osmandapp/Osmand.git

Browse source
This commit is contained in:
sonora 2011-10-12 01:43:11 +02:00
commit b388b829a5
2 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
OsmAnd/src/net/osmand/plus/activities/SavingTrackHelper.java
View file

@ -136,15 +136,15 @@ public class SavingTrackHelper extends SQLiteOpenHelper {
collectDBTracks(db, data); collectDBTracks(db, data);
// save file // save file
for (String f : data.keySet()) { for (final String f : data.keySet()) {
File fout = new File(dir, f + ".gpx"); //$NON-NLS-1$ File fout = new File(dir, f + ".gpx"); //$NON-NLS-1$
if (fout.exists() && !data.get(f).isEmpty()) { if (fout.exists() && !data.get(f).isEmpty()) {
f = f + "_" + new SimpleDateFormat("HH-mm.EEEE").format(new Date(data.get(f).findPointToShow().time)); //$NON-NLS-1$ String fileName = f + "_" + new SimpleDateFormat("HH-mm-ss_EEEE").format(new Date(data.get(f).findPointToShow().time)); //$NON-NLS-1$
fout = new File(dir, f + ".gpx"); //$NON-NLS-1$ fout = new File(dir, fileName + ".gpx"); //$NON-NLS-1$
int ind = 1; int ind = 1;
while (fout.exists()) { while (fout.exists()) {
fout = new File(dir, f + "_" + (++ind) + ".gpx"); //$NON-NLS-1$ //$NON-NLS-2$ fout = new File(dir, fileName + "_" + (++ind) + ".gpx"); //$NON-NLS-1$ //$NON-NLS-2$
} }
} }

10
build-scripts/daily_build.sh
View file

@ -11,17 +11,19 @@ mkdir -p $LOG_DIR
echo > $LOG_FILE echo > $LOG_FILE
touch $CLOG_FILE touch $CLOG_FILE
git pull --rebase 2>&1 >>$LOG_FILE cd "${DIRECTORY}"
git pull --rebase >>$LOG_FILE 2>&1
# 1. Update git directory # 1. Update git directory
"${DIRECTORY}/update_git.sh" >>$LOG_FILE 2>&1 "${DIRECTORY}/update_git.sh" >>$LOG_FILE 2>&1
# 2. Go through branches and generates builds # 2. Go through branches and generates builds
"${DIRECTORY}/build_branches.sh" >>$LOG_FILE 2>&1 "${DIRECTORY}/build_branches.sh" >>$LOG_FILE 2>&1
# exit if nothing was changed # exit if nothing was changed
if [ $? == 0 ]; then # if [ $? = 0 ]; then
exit # exit 0
fi # fi
# 3. upload to ftp server # 3. upload to ftp server
#"${DIRECTORY}/upload_ftp.sh" 2>&1 >>$LOG_FILE #"${DIRECTORY}/upload_ftp.sh" 2>&1 >>$LOG_FILE