gina 0.1.1-alpha.46 → 0.1.1-alpha.49

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "gina",
-  "version": "0.1.1-alpha.46",
+  "version": "0.1.1-alpha.49",
   "description": "MVC Framework for Node.",
   "keywords": [
     "framework",
@@ -42,7 +42,7 @@
     "./doc/man/gina-model.1",
     "./doc/man/gina-env.1"
   ],
-  "main": "./framework/v0.1.1-alpha.46/core/gna",
+  "main": "./framework/v0.1.1-alpha.49/core/gna",
   "scripts": {
     "prepare": "node ./script/prepare_version.js -g",
     "preinstall": "node ./script/pre_install.js -g",

package/script/post_install.js

@@ -55,6 +55,13 @@ function PostInstall() {
         }
 
         self.prefix = self.prefix.toString().replace(/\n/g, '');
+        if (
+            process.env.npm_config_prefix
+            && self.prefix != process.env.npm_config_prefix.toString().replace(/\n/g, '')
+        ) {
+            self.prefix = process.env.npm_config_prefix.toString().replace(/\n/g, '');
+            self.isCustomPrefix = true;
+        }
 
         // check for ~/.gina (first installation ?)
         var ginaHomeDir = _(getUserHome() + '/.gina', true);

package/script/pre_install.js

@@ -226,6 +226,9 @@ var helpers = null;
  * if you need to test, go to gina main folder
  * $ node --inspect-brk=5858 ./script/pre_install.js -g
  *
+ * NB.: At this stage, Gina is not yet installed and no lib or helper cannot be used here
+ *      excepted if Gina has been previously installed
+ *
  * @constructor
  * */
 function PreInstall() {
@@ -259,9 +262,12 @@ function PreInstall() {
         }
 
         self.prefix = self.prefix.toString().replace(/\n/g, '');
-        console.debug('process.env.npm_config_prefix.prefix => '+ process.env.npm_config_prefix.prefix);
-        if (process.env.npm_config_prefix && self.prefix != process.env.npm_config_prefix.prefix.toString().replace(/\n/g, '') ) {
-            self.prefix = process.env.npm_config_prefix.prefix.toString().replace(/\n/g, '');
+        console.debug('process.env.npm_config_prefix => '+ process.env.npm_config_prefix);
+        if (
+            process.env.npm_config_prefix
+            && self.prefix != process.env.npm_config_prefix.toString().replace(/\n/g, '')
+        ) {
+            self.prefix = process.env.npm_config_prefix.toString().replace(/\n/g, '');
             self.isCustomPrefix = true;
         }
 
@@ -317,7 +323,7 @@ function PreInstall() {
         var ginaHome = getUserHome() + ( isWin32() ? '\\.gina' : '/.gina' );
         if ( self.isResetNeeded && existsSync(ginaHome) ) {
             console.debug('`.gina` reset requested ...');
-            fs.rmSync(dir, { recursive: true, force: true });
+            fs.rmSync(ginaHome, { recursive: true, force: true });
         }
 
         // Let's temporarily install `colors` into `GINA_DIR` it will be removed by the `post_install.js` script

package/utils/helper.js

@@ -419,36 +419,6 @@ function MainHelper(opt) {
         }
 
         return runDir;
-
-
-            // // Means `/usr/local/var/lock` or `/usr/local/var/run` by default.
-            // runDirObj = new _('/usr/local/var/lock', true);
-            // if ( runDirObj.existsSync() ) {
-            //     if ( !runDirObj.isWritableSync() ) {
-            //         throw new Error('location '+ runDirObj.toUnixStyle() +' found but not writable !' )
-            //     }
-
-            //     runDirObj = new _( runDirObj.toUnixStyle() +'/gina', true );
-            //     if ( !runDirObj.existsSync() ) {
-            //         runDirObj.mkdirSync()
-            //     }
-
-            //     return runDirObj.toUnixStyle();
-            // }
-
-            // runDirObj = new _('/usr/local/var/run', true);//by default.
-            // if ( !runDirObj.isWritableSync() ) {
-            //     throw new Error('location '+ runDirObj.toUnixStyle() +' found but not writable !' )
-            // }
-
-            // runDirObj = new _( runDirObj.toUnixStyle() +'/gina', true );
-            // if ( !runDirObj.existsSync() ) {
-            //     runDirObj.mkdirSync()
-            // }
-            // // by default
-            // // return _( runDirObj.toUnixStyle() +'/gina', true );
-            // return runDirObj.toUnixStyle();
-
     }
 
     getTmpDir = function() {

package/framework/v0.1.1-alpha.46/VERSION

@@ -1 +0,0 @@
-0.1.1-alpha.46