From d08df3ff144a2ac3f7e93e74b6e3b3930d8bcbd0 Mon Sep 17 00:00:00 2001
From: Viktor Szakats <harbour@syenar.net>
Date: Fri, 1 Feb 2013 00:21:50 +0000
Subject: [PATCH] 2013-02-01 01:19 UTC+0100 Viktor Szakats (harbour syenar.net)
   * contrib/hbblink/blinker.prg   * utils/hbmk2/hbmk2.prg     * adapted to
 previous change     + SWPRUNCMD() now returns .F. on error, like the original

---
 harbour/ChangeLog.txt               |  6 ++++++
 harbour/contrib/hbblink/blinker.prg | 16 ++++------------
 harbour/utils/hbmk2/hbmk2.prg       |  4 ++--
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/harbour/ChangeLog.txt b/harbour/ChangeLog.txt
index 66f104d293..eaa749736b 100644
--- a/harbour/ChangeLog.txt
+++ b/harbour/ChangeLog.txt
@@ -10,6 +10,12 @@
      * Change, ! Fix, % Optimization, + Addition, - Removal, ; Comment
  */
 
+2013-02-01 01:19 UTC+0100 Viktor Szakats (harbour syenar.net)
+  * contrib/hbblink/blinker.prg
+  * utils/hbmk2/hbmk2.prg
+    * adapted to previous change
+    + SWPRUNCMD() now returns .F. on error, like the original
+
 2013-02-01 00:26 UTC+0100 Przemyslaw Czerpak (druzus/at/poczta.onet.pl)
   * harbour/include/hbwinuni.h
     + added HB_WINAPI_SYSTEM() macro
diff --git a/harbour/contrib/hbblink/blinker.prg b/harbour/contrib/hbblink/blinker.prg
index d1f7f4f3a7..9877090513 100644
--- a/harbour/contrib/hbblink/blinker.prg
+++ b/harbour/contrib/hbblink/blinker.prg
@@ -381,29 +381,21 @@ FUNCTION SwpNobOot( lValue )
 
 FUNCTION SwpRunCmd( cCommand, nMem, cRunPath, cTempPath )
 
-   LOCAL cShell
-
    HB_SYMBOL_UNUSED( nMem )
    HB_SYMBOL_UNUSED( cRunPath )
    HB_SYMBOL_UNUSED( cTempPath )
 
+   IF Empty( cCommand )
 #if defined( __PLATFORM__UNIX )
-   cShell := hb_GetEnv( "SHELL" )
+      cCommand := hb_GetEnv( "SHELL" )
 #else
-   cShell := hb_GetEnv( "COMSPEC" )
-#endif
-
-   IF ! Empty( cShell )
-#if defined( __PLATFORM__UNIX )
-      cCommand := cShell + " -c " + "'" + StrTran( cCommand, "'", "'\''" ) + "'"
-#else
-      cCommand := cShell + " /c " + cCommand
+      cCommand := hb_GetEnv( "COMSPEC" )
 #endif
    ENDIF
 
    t_nErrorLevel := hb_run( cCommand )
 
-   RETURN .T.
+   RETURN ( t_nErrorLevel != -1 )
 
 FUNCTION SwpSetEnv( cString )
 
diff --git a/harbour/utils/hbmk2/hbmk2.prg b/harbour/utils/hbmk2/hbmk2.prg
index e7c9c41bd5..8c9ec2ab9c 100644
--- a/harbour/utils/hbmk2/hbmk2.prg
+++ b/harbour/utils/hbmk2/hbmk2.prg
@@ -7236,9 +7236,9 @@ FUNCTION hbmk( aArgs, nArgTarget, /* @ */ lPause, nLevel )
       #if defined( __PLATFORM__WINDOWS )
          IF hbmk[ _HBMK_lGUI ]
             IF hb_osIsWinNT()
-               cCommand := GetEnv( "COMSPEC" ) + " /c " + 'start "" ' + FNameEscape( cCommand, _ESC_DBLQUOTE )
+               cCommand := 'start "" ' + FNameEscape( cCommand, _ESC_DBLQUOTE )
             ELSE
-               cCommand := GetEnv( "COMSPEC" ) + " /c " + "start " + cCommand
+               cCommand := "start " + cCommand
             ENDIF
          ENDIF
       #elif defined( __PLATFORM__OS2 )