Clean up compile scripts add virtual as terminal window option

Clean up compile scripts add virtual as terminal window option

Author: Matt Turner

Shuttle/AppDelegate.m

@@ -486,7 +486,7 @@ - (void) openHost:(NSMenuItem *) sender {
     }else{
         //inTerminal is not null and overrides the default values of open_in
         terminalWindow = [objectsFromJSON objectAtIndex:3];
-        if( ![terminalWindow isEqualToString:@"new"] && ![terminalWindow isEqualToString:@"current"] && ![terminalWindow isEqualToString:@"tab"])
+        if( ![terminalWindow isEqualToString:@"new"] && ![terminalWindow isEqualToString:@"current"] && ![terminalWindow isEqualToString:@"tab"] && ![terminalWindow isEqualToString:@"virtual"])
         {
             errorMessage = [NSString stringWithFormat:@"%@%@%@ %@",@"'",terminalWindow,@"'", NSLocalizedString(@"is not a valid value for inTerminal. Please fix this in the JSON file",nil)];
             errorInfo = NSLocalizedString(@"bad \"inTerminal\":\"VALUE\" in the JSON settings",nil);
@@ -509,6 +509,9 @@ - (void) openHost:(NSMenuItem *) sender {
     NSString *terminalCurrentWindow = [[NSBundle mainBundle] pathForResource:@"terminal-current-window" ofType:@"scpt"];
     NSString *terminalNewTabDefault = [[NSBundle mainBundle] pathForResource:@"terminal-new-tab-default" ofType:@"scpt"];
 
+    //Set Path to virtual with screen AppleScripts
+    NSString *terminalVirtualWithScreen = [[NSBundle mainBundle] pathForResource:@"virtual-with-screen" ofType:@"scpt"];
+    
     //Set the name of the handler that we are passing parameters too in the apple script
     NSString *handlerName = @"scriptRun";
 
@@ -555,6 +558,10 @@ - (void) openHost:(NSMenuItem *) sender {
             if ( [terminalWindow isEqualToString:@"tab"] ) {
                 [self runScript:iTermStableNewTabDefault handler:handlerName parameters:passParameters];
             }
+            //don't spawn a terminal run the command in the background using screen
+            if ( [terminalWindow isEqualToString:@"virtual"] ) {
+                [self runScript:terminalVirtualWithScreen handler:handlerName parameters:passParameters];
+            }
         }
         //iTermVersion is not set to "stable" using applescripts Configured for Nightly
         if( [iTermVersionPref isEqualToString:@"nightly"]) {
@@ -570,6 +577,10 @@ - (void) openHost:(NSMenuItem *) sender {
             if ( [terminalWindow isEqualToString:@"tab"] ) {
                 [self runScript:iTerm2NightlyNewTabDefault handler:handlerName parameters:passParameters];
             }
+            //don't spawn a terminal run the command in the background using screen
+            if ( [terminalWindow isEqualToString:@"virtual"] ) {
+                [self runScript:terminalVirtualWithScreen handler:handlerName parameters:passParameters];
+            }
         }
     }
     //If JSON settings are set to use Terminal.app
@@ -578,16 +589,18 @@ - (void) openHost:(NSMenuItem *) sender {
         if ( [terminalWindow isEqualToString:@"new"] ) {
             [self runScript:terminalNewWindow handler:handlerName parameters:passParameters];
         }
-        
         //if we are running in the current terminal Window
         if ( [terminalWindow isEqualToString:@"current"] ) {
             [self runScript:terminalCurrentWindow handler:handlerName parameters:passParameters];
         }
-        
         //we are using the default action of shuttle... The active window in a new tab
         if ( [terminalWindow isEqualToString:@"tab"] ) {
             [self runScript:terminalNewTabDefault handler:handlerName parameters:passParameters];
         }
+        //don't spawn a terminal run the command in the background using screen
+        if ( [terminalWindow isEqualToString:@"virtual"] ) {
+            [self runScript:terminalVirtualWithScreen handler:handlerName parameters:passParameters];
+        }
     }
 }
 

apple-scripts/compile-Terminal.sh

@@ -2,5 +2,4 @@
 echo "compiling applescripts for OS X terminal..."
 osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/terminal-new-window.scpt -x ~/Git/shuttle/apple-scripts/terminal/terminal-new-window.applescript
 osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/terminal-current-window.scpt -x ~/Git/shuttle/apple-scripts/terminal/terminal-current-window.applescript
-osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/terminal-new-tab-default.scpt -x ~/Git/shuttle/apple-scripts/terminal/terminal-new-tab-default.applescript
-
+osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/terminal-new-tab-default.scpt -x ~/Git/shuttle/apple-scripts/terminal/terminal-new-tab-default.applescript

apple-scripts/compile-Virtual.sh

@@ -0,0 +1,3 @@
+#!/bin/bash
+echo "compiling applescripts for OS X virtual..."
+osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/virtual-with-screen.scpt -x ~/Git/shuttle/apple-scripts/virtual/virtual-with-screen.applescript

apple-scripts/compile-iTermNightly.sh

@@ -2,6 +2,4 @@
 echo "compiling applescripts for iTerm Nightly..."
 osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/iTerm2-nightly-new-window.scpt -x ~/Git/shuttle/apple-scripts/iTermNightly/iTerm2-nightly-new-window.applescript 
 osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/iTerm2-nightly-current-window.scpt -x ~/Git/shuttle/apple-scripts/iTermNightly/iTerm2-nightly-current-window.applescript 
-osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/iTerm2-nightly-new-tab-default.scpt -x ~/Git/shuttle/apple-scripts/iTermNightly/iTerm2-nightly-new-tab-default.applescript
-
-
+osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/iTerm2-nightly-new-tab-default.scpt -x ~/Git/shuttle/apple-scripts/iTermNightly/iTerm2-nightly-new-tab-default.applescript

apple-scripts/compile-iTermStable.sh

@@ -2,6 +2,4 @@
 echo "compiling applescripts for iTerm Stable..."
 osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/iTerm2-stable-new-window.scpt -x ~/Git/shuttle/apple-scripts/iTermStable/iTerm2-stable-new-window.applescript
 osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/iTerm2-stable-current-window.scpt -x ~/Git/shuttle/apple-scripts/iTermStable/iTerm2-stable-current-window.applescript
-osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/iTerm2-stable-new-tab-default.scpt -x ~/Git/shuttle/apple-scripts/iTermStable/iTerm2-stable-new-tab-default.applescript
-
-
+osacompile -o ~/Git/shuttle/Shuttle/apple-scpt/iTerm2-stable-new-tab-default.scpt -x ~/Git/shuttle/apple-scripts/iTermStable/iTerm2-stable-new-tab-default.applescript

apple-scripts/virtual/virtual-with-screen.applescript

@@ -14,4 +14,4 @@ end scriptRun
 
 on CommandRun(withCmd)
 	do shell script withCmd
-end CommandRun
+end CommandRun