ruby-shell 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5f20098ee7a4e00745916fb1830834273a00dbc5e92bea6b5f1cbd0f66b48639
-  data.tar.gz: 135135d2f788b75eb9e51cebd3dd3d680c4f07717819bf6fc9232bf8b4a32943
+  metadata.gz: ee2ef357d1196f43811ad6974313bbdb057f61cf90219146936f70a2ec6f16bb
+  data.tar.gz: 85540ca12677d88d6b2fb6999f17ce871b7c5142f20a0fa14e03685f82f41853
 SHA512:
-  metadata.gz: c3494e59f58963262f8142850dbda9a76c50e6367a681389cd921a8db1bc47d2e68a6490799696c8b8e3437234934070364194f3aa81568a1f8bfdcfc61d9c0d
-  data.tar.gz: 8586e7cda13c597863e1d93cb978f0e5815b554a177b6977e41e0f2bc0f1d5a6017e0c04dbf32e45369a2a16180eface4bd67831f8be74b6dc7129f5664e63ed
+  metadata.gz: f7a35b051b9d768cb2065e6308eecc030f3b153a31881b31e25813a377de06ea98b5e76f55233dbc0ae1ec30920091ee62817352f43fc5645c3a3d69db746c78
+  data.tar.gz: f8aeb41fa3870b02d96b111126c1770fb74e235a01847947937461c1a697195e3fc6152eb5a45a147c1703278e12a1b8dc5c279e1c1e4b51d81fbeb0672ed27f

data/bin/rsh

@@ -8,7 +8,7 @@
 # Web_site:   http://isene.com/
 # Github:     https://github.com/isene/rsh
 # License:    Public domain
-@version    = "2.9.1" # Bug fix: Improved command coloring for local executables and after ENTER
+@version    = "2.10.1" # Bug fix: Improved && operator logic for proper conditional execution
 
 # MODULES, CLASSES AND EXTENSIONS
 class String # Add coloring to strings (with escaping for Readline)
@@ -865,27 +865,39 @@ end
 def execute_conditional(cmd_line)
   # Split on && and || while preserving the operators
   parts = cmd_line.split(/(\s*&&\s*|\s*\|\|\s*)/)
-  
-  result = true
+
+  result = nil  # Start with nil to handle first command
   i = 0
+
   while i < parts.length
-    command = parts[i].strip
-    next if command.empty?
-    
-    if command == '&&'
-      i += 1
-      next unless result  # Skip if previous command failed
-    elsif command == '||'
-      i += 1
-      next if result      # Skip if previous command succeeded
+    part = parts[i].strip
+    i += 1
+    next if part.empty?
+
+    if part == '&&'
+      # If previous command failed, skip the rest until we find || or end
+      unless result
+        while i < parts.length && parts[i].strip != '||'
+          i += 1
+        end
+      end
+    elsif part == '||'
+      # If previous command succeeded, skip the rest until we find && or end
+      if result
+        while i < parts.length && parts[i].strip != '&&'
+          i += 1
+        end
+      end
     else
       # Execute the command
-      success = system(command)
+      success = system(part)
       result = success
-      puts " Command failed: #{command} (exit #{$?.exitstatus})" unless success
+      @last_exit = $?.exitstatus
+      puts " Command failed: #{part} (exit #{@last_exit})" unless success
     end
-    i += 1
   end
+
+  result
 end
 def expand_braces(str)
   # Simple brace expansion: {a,b,c} -> a b c

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ruby-shell
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Geir Isene
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-16 00:00:00.000000000 Z
+date: 2025-09-22 00:00:00.000000000 Z
 dependencies: []
 description: 'A shell written in Ruby with extensive tab completions, aliases/nicks,
   history, syntax highlighting, theming, auto-cd, auto-opening files and more. UPDATE