Script 'mail_helper' called by obssrc
Hello community,

here is the log from the commit of package yast2-installation for 
openSUSE:Factory checked in at 2021-03-30 20:51:26
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/yast2-installation (Old)
 and      /work/SRC/openSUSE:Factory/.yast2-installation.new.2401 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Package is "yast2-installation"

Tue Mar 30 20:51:26 2021 rev:465 rq:882110 version:4.3.36

Changes:
--------
--- /work/SRC/openSUSE:Factory/yast2-installation/yast2-installation.changes    
2021-03-28 11:54:08.568106043 +0200
+++ 
/work/SRC/openSUSE:Factory/.yast2-installation.new.2401/yast2-installation.changes
  2021-03-30 20:51:43.056137705 +0200
@@ -1,0 +2,10 @@
+Mon Mar 29 16:25:00 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Expert console: fixed "shell" command
+  - Run X terminal in GUI instead of "dash" (related to the previous
+    fix for job control error messages bsc#1183648)
+  - Override TERM to "vt100" when running in fbiterm,
+    a workaround for frozen vim (bsc#1183652)
+- 4.3.36
+
+-------------------------------------------------------------------

Old:
----
  yast2-installation-4.3.35.tar.bz2

New:
----
  yast2-installation-4.3.36.tar.bz2

++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

Other differences:
------------------
++++++ yast2-installation.spec ++++++
--- /var/tmp/diff_new_pack.o0YUmp/_old  2021-03-30 20:51:43.780138516 +0200
+++ /var/tmp/diff_new_pack.o0YUmp/_new  2021-03-30 20:51:43.784138521 +0200
@@ -17,7 +17,7 @@
 
 
 Name:           yast2-installation
-Version:        4.3.35
+Version:        4.3.36
 Release:        0
 Summary:        YaST2 - Installation Parts
 License:        GPL-2.0-only

++++++ yast2-installation-4.3.35.tar.bz2 -> yast2-installation-4.3.36.tar.bz2 
++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.3.35/package/yast2-installation.changes 
new/yast2-installation-4.3.36/package/yast2-installation.changes
--- old/yast2-installation-4.3.35/package/yast2-installation.changes    
2021-03-18 08:17:18.000000000 +0100
+++ new/yast2-installation-4.3.36/package/yast2-installation.changes    
2021-03-30 08:17:34.000000000 +0200
@@ -1,4 +1,14 @@
 -------------------------------------------------------------------
+Mon Mar 29 16:25:00 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
+
+- Expert console: fixed "shell" command
+  - Run X terminal in GUI instead of "dash" (related to the previous
+    fix for job control error messages bsc#1183648)
+  - Override TERM to "vt100" when running in fbiterm,
+    a workaround for frozen vim (bsc#1183652)
+- 4.3.36
+
+-------------------------------------------------------------------
 Wed Mar 17 16:53:42 UTC 2021 - Ladislav Slez??k <lsle...@suse.cz>
 
 - Expert console: use "dash" if available instead of "bash" shell
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.3.35/package/yast2-installation.spec 
new/yast2-installation-4.3.36/package/yast2-installation.spec
--- old/yast2-installation-4.3.35/package/yast2-installation.spec       
2021-03-18 08:17:18.000000000 +0100
+++ new/yast2-installation-4.3.36/package/yast2-installation.spec       
2021-03-30 08:17:34.000000000 +0200
@@ -16,7 +16,7 @@
 #
 
 Name:           yast2-installation
-Version:        4.3.35
+Version:        4.3.36
 Release:        0
 Group:          System/YaST
 License:        GPL-2.0-only
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.3.35/src/lib/installation/console/plugins/shell_command.rb
 
new/yast2-installation-4.3.36/src/lib/installation/console/plugins/shell_command.rb
--- 
old/yast2-installation-4.3.35/src/lib/installation/console/plugins/shell_command.rb
 2021-03-18 08:17:18.000000000 +0100
+++ 
new/yast2-installation-4.3.36/src/lib/installation/console/plugins/shell_command.rb
 2021-03-30 08:17:34.000000000 +0200
@@ -16,24 +16,48 @@
     # define the "shell" command in the expert console
     class Commands
       def shell
-        # dash is a simple shell and needs less memory, also it does not 
complain
-        # about missing job control terminal
-        if File.exist?("/bin/dash")
-          system("/bin/dash")
-        # use full featured bash
-        elsif File.exist?("/bin/bash")
-          system("/bin/bash")
-        # fallback
+        if Yast::UI.TextMode
+          tui_shell
         else
-          system("/bin/sh")
+          gui_shell
         end
       end
 
     private
 
+      def tui_shell
+        puts quit_hint
+
+        # some interactive tools like "vim" get stuck when running in "fbiterm"
+        # "fbiterm" sets TERM to "iterm", the workaround is to override it
+        # to "vt100" (bsc#1183652)
+        term = ENV["TERM"] == "iterm" ? "TERM=vt100" : ""
+
+        system("#{term} /bin/bash")
+      end
+
+      def gui_shell
+        terms = ["/usr/bin/xterm", "/usr/bin/konsole", 
"/usr/bin/gnome-terminal"]
+        cmd = terms.find { |s| File.exist?(s) }
+
+        if cmd
+          puts "Starting a terminal application (#{cmd})..."
+          puts quit_hint
+          puts
+          # hide possible errors, xterm complains about some missing fonts
+          # in the inst-sys
+          system("#{cmd} 2> /dev/null")
+        else
+          puts "ERROR: Cannot find any X terminal application"
+        end
+      end
+
+      def quit_hint
+        "Use the \"exit\" command or press Ctrl+D to return back to the YaST 
console."
+      end
+
       def shell_description
-        "Starts a shell session, use the \"exit\" command\n" \
-        "or press Ctrl+D to return back to the YaST console"
+        "Starts a shell session.\n#{quit_hint}"
       end
     end
   end
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' 
'--exclude=.svnignore' 
old/yast2-installation-4.3.35/src/lib/installation/console.rb 
new/yast2-installation-4.3.36/src/lib/installation/console.rb
--- old/yast2-installation-4.3.35/src/lib/installation/console.rb       
2021-03-18 08:17:18.000000000 +0100
+++ new/yast2-installation-4.3.36/src/lib/installation/console.rb       
2021-03-30 08:17:34.000000000 +0200
@@ -49,7 +49,7 @@
     class << self
       # open a console and run an interactive IRB session in it
       # testing in installed system:
-      # ruby -I src/lib -r installation/console.rb -e 
::Installation::Console.run
+      # Y2DIR=./src ruby -I src/lib -r installation/console.rb -e 
::Installation::Console.run
       def run
         console = Yast::UI.TextMode ? Console::Tui.new : Console::Gui.new
         console.run do

Reply via email to