Navigation Menu

Skip to content

Commit

Permalink
aggregationname fix
Browse files Browse the repository at this point in the history
  • Loading branch information
felixherbst committed Jun 8, 2018
1 parent 5836027 commit 5b6cfcf
Show file tree
Hide file tree
Showing 5 changed files with 6,552 additions and 8,011 deletions.
2 changes: 1 addition & 1 deletion analysis/gradlew
Expand Up @@ -156,7 +156,7 @@ fi

# Escape application args
save () {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/aggregationName;1s/^/'/;\$s/\$/' \\\\/" ; done
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
Expand Down
2 changes: 1 addition & 1 deletion gradlew
Expand Up @@ -156,7 +156,7 @@ fi

# Escape application args
save ( ) {
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/aggregationName;1s/^/'/;\$s/\$/' \\\\/" ; done
for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
echo " "
}
APP_ARGS=$(save "$@")
Expand Down
4 changes: 2 additions & 2 deletions script/make_release.sh
Expand Up @@ -48,7 +48,7 @@ select CONFIRM in "yes" "no"; do
done

# bump version in gradle.properties
$(perl -p -i -e "s/^currentVersion=(.*)/currentVersion=${NEW_VERSION}/aggregationName" ../analysis/gradle.properties)
$(perl -p -i -e "s/^currentVersion=(.*)/currentVersion=${NEW_VERSION}/g" ../analysis/gradle.properties)
echo "v${NEW_VERSION}"
echo "incremented version in ../analysis/gradle.properties"

Expand All @@ -63,7 +63,7 @@ echo "incremented version in ../visualization/package.json + locks"
DATE=`date +%Y-%m-%d`
UNRELEASED_TPL="## [unreleased]\n### Added\n\n### Changed\n\n### Removed\n\n### Fixed\n\n"
REPLACE="${UNRELEASED_TPL}## [${NEW_VERSION}] - ${DATE}"
$(perl -p -i -e "s/^\#\# \[unreleased\]/${REPLACE}/aggregationName" ../CHANGELOG.md)
$(perl -p -i -e "s/^\#\# \[unreleased\]/${REPLACE}/g" ../CHANGELOG.md)
echo "updated ../CHANGELOG.md"

# confirm and make a commit and tag it correctly
Expand Down
Expand Up @@ -184,7 +184,7 @@ export class SettingsService implements DataServiceSubscriber, CameraChangeSubsc
}

/**
* updates the settings object according to url parameters. url parameters are named like the accessors of the Settings object. E.aggregationName. scale.x or areaMetric
* updates the settings object according to url parameters. url parameters are named like the accessors of the Settings object. E.g. scale.x or areaMetric
* @emits {settings-changed} transitively on call
*/
public updateSettingsFromUrl() {
Expand Down

0 comments on commit 5b6cfcf

Please sign in to comment.