GRIFFON-478 commands are not executed with their defualt environment

griffon · Mar 13, 2012 · c50207b · c50207b
1 parent 8f36cf8
commit c50207b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/...ects/griffon-cli/src/main/groovy/org/codehaus/griffon/cli/parsing/DefaultCommandLine.java b/...ects/griffon-cli/src/main/groovy/org/codehaus/griffon/cli/parsing/DefaultCommandLine.java
@@ -61,6 +61,7 @@ public void setCommand(String name) {
     }
 
     public String getEnvironment() {
+        /*
         boolean useDefaultEnv = environment == null;
         String env;
         if (useDefaultEnv && commandName != null) {
@@ -74,6 +75,8 @@ public String getEnvironment() {
         System.setProperty(Environment.DEFAULT, String.valueOf(useDefaultEnv));
 
         return env;
+        */
+        return environment;
     }
 
     public String lookupEnvironmentForCommand() {

diff --git a/subprojects/griffon-resources/src/app/conf/BuildConfig.groovy b/subprojects/griffon-resources/src/app/conf/BuildConfig.groovy
@@ -3,15 +3,14 @@ environments {
     development {
         signingkey {
             params {
-                sigfile = 'GRIFFON'
-                keystore = "${basedir}/griffon-app/conf/keys/devKeystore"
-                alias = 'development'
+                // sigfile = 'GRIFFON'
+                // keystore = "${basedir}/griffon-app/conf/keys/devKeystore"
+                // alias = 'development'
                 storepass = 'BadStorePassword'
                 keypass   = 'BadKeyPassword'
                 lazy      = true // only sign when unsigned
             }
         }
-
     }
     test {
         griffon {
@@ -24,9 +23,6 @@ environments {
     production {
         signingkey {
             params {
-                sigfile = 'GRIFFON'
-                keystore = 'CHANGE ME'
-                alias = 'CHANGE ME'
                 // NOTE: for production keys it is more secure to rely on key prompting
                 // no value means we will prompt //storepass = 'BadStorePassword'
                 // no value means we will prompt //keypass   = 'BadKeyPassword'