gina 0.1.1-alpha.101 → 0.1.1-alpha.104

package/script/post_install.js

@@ -393,7 +393,7 @@ function PostInstall() {
 
     //Creating framework command line file for nix.
     var createGinaFile = function(win32Name, callback) {
-        // Created by NPM for global installations
+        // local install only
         if (self.isGlobalInstall) {
             return callback(false);
         }
@@ -401,37 +401,28 @@ function PostInstall() {
         console.info('Current prefix: '+ self.prefix );
         console.info('Current package.json: '+  _(self.gina + '/package.json', true) );
 
-        var name = require( _(self.gina + '/package.json', true) ).name;
-        console.info('Package name: '+ name );
+        var name = 'gina';
         console.info('Creating framework command line:');
-        var appPath = process.cwd();
-        // _( self.gina.substring(0, (self.gina.length - ("node_modules/" + name + '/').length)) );
-
-
+        var appPath = process.env.INIT_CWD;//process.cwd();
         console.debug('App path: '+ appPath);
-        var source = _(self.versionPath + '/core/template/command/gina.tpl', true);
+        // var source = _(self.versionPath + '/core/template/command/gina.tpl', true);
+        var source = _(appPath + '/node_modules/.bin/gina', true);
         console.debug('Source: '+ source);
         var target = _(appPath +'/'+ name, true);
-        console.debug('Target: '+ target);
-
         if ( win32Name && typeof(win32Name) != 'undefined') {
-            target = _(appPath +'/'+ win32Name)
+            target = _(appPath +'/'+ win32Name, true)
         }
-        //Will override.
-        console.info('linking to binaries dir: '+ source +' -> '+ target);
+        console.debug('Target: '+ target);
+
         if ( callback && typeof(callback) != 'undefined') {
-            if ( !self.isGlobalInstall ) { // local install only
-                lib.generator.createFileFromTemplate(source, target, function onGinaFileCreated(err) {
-                    return callback(err)
-                })
-            } else {
-                // configureGina();
-                return callback(false)
-            }
-        } else {
-            if ( !self.isGlobalInstall ) {
-                lib.generator.createFileFromTemplate(source, target)
+            console.info('linking to binaries dir: '+ source +' -> '+ target);
+            try {
+                new _(source).symlinkSync(target)
+            } catch (err) {
+                return callback(err)
             }
+
+            return callback(false);
         }
     }
 
@@ -793,12 +784,6 @@ function PostInstall() {
     self.end = function(done) {
 
         restoreSymlinks();
-        // update package.json
-        // var pkgObj = require(pack);
-        // pkgObj.config.prefix = self.prefix;
-        // pkgObj.config.globalMode = self.isGlobalInstall;
-        // new _(pack, true).rmSync();
-        // lib.generator.createFileFromDataSync(JSON.stringify(pkgObj, null, 2), pack);
 
         // configuring Gina
         var ginaBinanry = _(self.gina + '/bin/gina', true);

package/utils/helper.js

@@ -320,7 +320,7 @@ function MainHelper(opt) {
             return logDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         if ( isWin32() ) {
             logDir = process.env.LOG ||
@@ -396,7 +396,7 @@ function MainHelper(opt) {
             return runDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         runDir = (isWin32()) ? getUserHome() + '\\.gina\\run' : prefix + '/var/lock';
 
@@ -461,7 +461,7 @@ function MainHelper(opt) {
             return dir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
+        var prefix = getEnvVar('GINA_PREFIX') || self.prefix  || self.defaultPrefix || execSync('npm config get prefix').toString().replace(/\n$/g, '');
 
         // support for node 0.10.x & 0.11.x
         var tmp = (os.tmpdir) ? os.tmpdir : function() {

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

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