gina 0.1.1-alpha.102 → 0.1.1-alpha.105

package/script/post_install.js

@@ -392,8 +392,8 @@ function PostInstall() {
     }
 
     //Creating framework command line file for nix.
-    var createGinaFile = function(win32Name, callback) {
-        // Created by NPM for global installations
+    var createGinaFile = function(callback) {
+        // local install only
         if (self.isGlobalInstall) {
             return callback(false);
         }
@@ -401,49 +401,39 @@ 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 );
         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;
         console.debug('App path: '+ appPath);
-        var source = _(self.versionPath + '/core/template/command/gina.tpl', true);
+        var source = _(appPath + '/node_modules/.bin/gina', true);
+        var target = _(appPath +'/gina', true);
+        if ( isWin32() ) {
+            source = _(appPath + '/node_modules/.bin/gina.bat', true)
+            target = _(appPath +'/gina.bat', true)
+        }
         console.debug('Source: '+ source);
-        var target = _(appPath +'/'+ name, true);
         console.debug('Target: '+ target);
 
-        if ( win32Name && typeof(win32Name) != 'undefined') {
-            target = _(appPath +'/'+ win32Name)
-        }
-        //Will override.
-        console.info('linking to binaries dir: '+ source +' -> '+ 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);
         }
     }
 
     self.createGinaFileForPlatform = async function(done) {
         console.info('Creating platform file');
-        var name = require( _(self.versionPath + '/package.json') ).name;
+        // var name = require( _(self.versionPath + '/package.json') ).name;
 
-        var filename = ( (self.isWin32) ? '.' : '' ) + name;
+        // var filename = ( (self.isWin32) ? '.' : '' ) + name;
 
-        var keepGoing = function(filename) {
+        var keepGoing = function() {
 
-            createGinaFile(filename, function onFileCreated(err) {
+            createGinaFile(function onFileCreated(err) {
                 if (err) {
                     return done(err)
                 }
@@ -486,26 +476,26 @@ function PostInstall() {
             })
         }
 
-        if (self.isWin32) {
-            // var appPath = _( self.versionPath.substring(0, (self.versionPath.length - ("node_modules/" + name + '/').length)) );
-            var appPath = process.cwd()
-            var source = _(self.versionPath + '/core/template/command/gina.bat.tpl');
-            var target = _(appPath +'/'+ name + '.bat');
-            if ( fs.existsSync(target) ) {
-                fs.unlinkSync(target);
-                // have to wait for windows to complete this
-                setTimeout( async function(){
-                    lib.generator.createFileFromTemplate(source, target);
-                    await keepGoing(filename)
-                }, 1000)
-            } else {
-                lib.generator.createFileFromTemplate(source, target);
-                await keepGoing(filename)
-            }
+        // if (self.isWin32) {
+        //     // var appPath = _( self.versionPath.substring(0, (self.versionPath.length - ("node_modules/" + name + '/').length)) );
+        //     var appPath = process.cwd()
+        //     var source = _(self.versionPath + '/core/template/command/gina.bat.tpl');
+        //     var target = _(appPath +'/'+ name + '.bat');
+        //     if ( fs.existsSync(target) ) {
+        //         fs.unlinkSync(target);
+        //         // have to wait for windows to complete this
+        //         setTimeout( async function(){
+        //             lib.generator.createFileFromTemplate(source, target);
+        //             await keepGoing(filename)
+        //         }, 1000)
+        //     } else {
+        //         lib.generator.createFileFromTemplate(source, target);
+        //         await keepGoing(filename)
+        //     }
 
-        } else {
-            await keepGoing(filename)
-        }
+        // } else {
+            await keepGoing()
+        // }
     }
 
 

package/utils/helper.js

@@ -320,7 +320,7 @@ function MainHelper(opt) {
             return logDir
         }
 
-        var prefix = getEnvVar('GINA_PREFIX') || slef.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 ||
@@ -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.102/VERSION

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