Oops, fix after bad merge
authorJan Vrany <jan.vrany@fit.cvut.cz>
Tue, 13 Jan 2015 11:01:53 +0100
changeset 17299 7a4cec6d4964
parent 17298 4ca27d747797
child 17300 bb7909627f40
Oops, fix after bad merge
UnixOperatingSystem.st
--- a/UnixOperatingSystem.st	Tue Jan 13 10:23:57 2015 +0100
+++ b/UnixOperatingSystem.st	Tue Jan 13 11:01:53 2015 +0100
@@ -1837,7 +1837,7 @@
             cmd := cmd bindWith:aFilenameOrString asString.
         ] ifFalse:[
             cmd := cmd, ' "', aFilenameOrString asString, '"'.
-        ]. 
+        ].
         (self
                 startProcess:cmd
                 inputFrom:nil outputTo:nil
@@ -1864,14 +1864,14 @@
     | xdgCurrentDesktop |
 
     xdgCurrentDesktop := self getEnvironment: 'XDG_CURRENT_DESKTOP'.
-    ((xdgCurrentDesktop = 'GNOME') and:[self canExecuteCommand: 'gnome-open']) ifTrue:[ 
+    ((xdgCurrentDesktop = 'GNOME') and:[self canExecuteCommand: 'gnome-open']) ifTrue:[
         ^ 'gnome-open'
     ].
     "/ Guess...
-    ((xdgCurrentDesktop = 'KDE') and:[self canExecuteCommand: 'kde-open']) ifTrue:[ 
+    ((xdgCurrentDesktop = 'KDE') and:[self canExecuteCommand: 'kde-open']) ifTrue:[
         ^ 'kde-open'
     ].
-    (self canExecuteCommand: 'xdg-open') ifTrue:[ 
+    (self canExecuteCommand: 'xdg-open') ifTrue:[
         ^ 'xdg-open'
     ].
     ^ nil
@@ -1885,6 +1885,8 @@
 
     "Created: / 13-01-2015 / 09:02:07 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 
+! !
+
 !UnixOperatingSystem class methodsFor:'directory access'!
 
 closeDirectory:dirPointer
@@ -13767,11 +13769,11 @@
 !UnixOperatingSystem class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.409 2015-01-13 09:23:57 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.410 2015-01-13 10:01:53 vrany Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.409 2015-01-13 09:23:57 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libbasic/UnixOperatingSystem.st,v 1.410 2015-01-13 10:01:53 vrany Exp $'
 ! !