Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP

Comparing changes

Choose two branches to see what's changed or to start a new pull request. If you need to, you can also compare across forks.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also compare across forks.
base fork: revbingo/play
...
head fork: revbingo/play
Checking mergeability… Don't worry, you can still create the pull request.
  • 2 commits
  • 2 files changed
  • 0 commit comments
  • 1 contributor
Showing with 22 additions and 14 deletions.
  1. +4 −1 framework/src/play/Play.java
  2. +18 −13 play
View
5 framework/src/play/Play.java
@@ -341,7 +341,7 @@ public static void readConfiguration() {
System.exit(-1);
}
}
- // Ok, check for instance specifics configuration
+ // OK, check for instance specifics configuration
Properties newConfiguration = new OrderSafeProperties();
Pattern pattern = Pattern.compile("^%([a-zA-Z0-9_\\-]+)\\.(.*)$");
for (Object key : configuration.keySet()) {
@@ -376,6 +376,9 @@ public static void readConfiguration() {
} else {
r = System.getProperty(jp);
if (r == null) {
+ r = System.getenv(jp);
+ }
+ if (r == null) {
Logger.warn("Cannot replace %s in configuration (%s=%s)", jp, key, value);
continue;
}
View
31 play
@@ -43,13 +43,16 @@ try:
else:
play_env["id"] = ''
- # ~~~~~~~~~~~~~~~~~~~~~~ Display logo
- print r"~ _ _ "
- print r"~ _ __ | | __ _ _ _| |"
- print r"~ | '_ \| |/ _' | || |_|"
- print r"~ | __/|_|\____|\__ (_)"
- print r"~ |_| |__/ "
- print r"~"
+ showLogo = sys.argv.count("--silent") == 0
+
+ if showLogo:
+ # ~~~~~~~~~~~~~~~~~~~~~~ Display logo
+ print r"~ _ _ "
+ print r"~ _ __ | | __ _ _ _| |"
+ print r"~ | '_ \| |/ _' | || |_|"
+ print r"~ | __/|_|\____|\__ (_)"
+ print r"~ |_| |__/ "
+ print r"~"
play_version_file = os.path.join(play_env["basedir"], 'framework', 'src', 'play', 'version')
if not os.path.exists(play_version_file):
@@ -60,7 +63,8 @@ try:
play_env["version"] = open(play_version_file).readline().strip()
- print "~ play! %s, http://www.playframework.org" % (play_env["version"])
+ if showLogo:
+ print "~ play! %s, http://www.playframework.org" % (play_env["version"])
# ~~~~~~~~~~~~~~~~~~~~~~ Where is the application?
application_path = None
@@ -106,10 +110,11 @@ try:
if not isTestFrameworkId( play_env["id"] ):
play_env["id"] = 'test'
- if play_env["id"] is not '':
- print "~ framework ID is %s" % play_env["id"]
- print "~"
-
+ if showLogo:
+ if play_env["id"] is not '':
+ print "~ framework ID is %s" % play_env["id"]
+ print "~"
+
# ~~~~~~~~~~~~~~~~~ Checking for disable_check_jpda
disable_check_jpda = False
if remaining_args.count('-f') == 1:
@@ -124,7 +129,7 @@ try:
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
cmdloader = CommandLoader(play_env["basedir"])
-
+
# ~~~~~~~~~~~~~~~~~ Resolve dependencies if needed
if remaining_args.count('--deps') == 1:
cmdloader.commands['dependencies'].execute(command='dependencies', app=play_app, args=['--sync'], env=play_env, cmdloader=cmdloader)

No commit comments for this range

Something went wrong with that request. Please try again.