Commit c25943e1 authored by fsmithred's avatar fsmithred

use zless for help

parent 71a0ec3d
refractainstaller-gui (9.4.3) unstable; urgency=low
* Use zless to read gzipped installer_help file.
refractainstaller-gui (9.4.2) unstable; urgency=low
* Add support for virtual disks (/dev/vd[a-z])
......
#!/usr/bin/env bash
version="Refracta UEFI/BIOS Installer (Yad) 9.4.2 (20180523)"
version="Refracta UEFI/BIOS Installer (Yad) 9.4.3 (20180827)"
TEXTDOMAIN=refractainstaller-gui
TEXTDOMAINDIR=/usr/share/locale/
......@@ -160,13 +160,8 @@ fi
# Greeting window
<<<<<<< HEAD
yad --title="$window_title" --width=480 \
--button=$"Continue":0 --button=$"Exit":1 --center \
=======
yad --title="$window_title" --width=480 --button=$"Continue":0 \
--button=$"Exit":1 --center --borders=10 \
>>>>>>> suites/ascii
--text=$"$live_session_warning
This utility will install a running live-CD or live-USB to your hard drive.
......@@ -175,11 +170,7 @@ yad --title="$window_title" --width=480 --button=$"Continue":0 \
type, including but not limited to express, implied, merchantability or
fitness of purpose.
<<<<<<< HEAD
Copyright 2011-2017 fsmithred@gmail.com,
=======
Copyright 2011-2018 fsmithred@gmail.com,
>>>>>>> suites/ascii
based on refractainstaller-8.0.3 by Dean Linkous. \n Version: $version \n\n\
${custom_text}\n
......@@ -201,7 +192,9 @@ if [[ $exit_code -ne 0 ]] ; then
yad --question --title=$"Error" --window-icon=error --center --borders=10 --button=$"Continue":0 --button=$"Exit now":1 \
--text=$"Error detected: $exit_code $error_message
\nSee $error_log for details. \n\nThis may not be fatal.. Press \"Continue\" to proceed anyway"
# Add button "See error log" ? If so, remove "&" and add continue/exit buttons
#less "$error_log" | yad --text-info --title="Error Log" --width=600 --height=500 --borders=10 \
--button=$"Close":0 &
if [[ $? -ne 0 ]] ; then
cleanup
exit 1
......@@ -295,8 +288,8 @@ bios_grub_dev=$(env LC_ALL=C fdisk -l | awk '/BIOS boot/ { print $1 }')
show_installer_help () {
yad --text-info --title="$window_title" --width=600 --height=500 --borders=10 \
--button=$"Close":0 < "$installer_help" &
zless "$installer_help" | yad --text-info --title="$window_title" --width=600 --height=500 --borders=10 \
--button=$"Close":0 &
sleep 2
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment