Commit cb53124c authored by fsmithred's avatar fsmithred

little fixes

parent ff00a218
refractainstaller-gui (9.2.3) unstable; urgency=low
* Fixed some typos.
* Wrapper script starts installer in debug mode for verbose log.
* Exclude dbus/machine-id and popularity-contest.conf.
-- fsmithred <fsmithred@gmail.com> Sun, 19 Nov 2017 15:00:00 -0500
refractainstaller-gui (9.2.2) unstable; urgency=low
* Wrapper script tests for efi and selects correct installer.
......
#!/usr/bin/env bash
version="Refracta UEFI Installer (Yad) 9.2.2 (20170413)"
version="Refracta UEFI Installer (Yad) 9.2.3 (20171014)"
uefi_help="/usr/lib/refractainstaller/uefi_install.readme"
TEXTDOMAIN=refractainstaller-gui
......@@ -222,8 +222,8 @@ use another installed linux to boot this one.
DO NOT FORMAT A PRE-EXISTING EFI PARTITION!!!
"
ret="$?"
case "$ret" in
answer="$?"
case "$answer" in
0) show_uefi_help ;;
1) ;;
2) exit 0 ;;
......@@ -314,6 +314,8 @@ copy_excludes () {
- /etc/mtab
- /home/snapshot/
- /home/*/.gvfs
- /var/lib/dbus/machine-id
- /etc/popularity-contest.conf
# Added for newer version of live-config/live-boot
# in sid (to become Jessie)
......@@ -323,6 +325,12 @@ copy_excludes () {
- /lib/live/mount
- /run/*
# Added for symlink /lib
- /usr/lib/live/overlay
- /usr/lib/live/image
- /usr/lib/live/rootfs
- /usr/lib/live/mount
EOF
chmod 666 "$rsync_excludes"
......@@ -449,6 +457,8 @@ if $(echo $opts | grep -q 09); then
else
no_format="yes"
fi
else
no_format="" # just in case config file is set to yes.
fi
if $(echo $opts | grep -q 10) || [ "$use_uuid" = "yes" ]; then
if [[ $encrypt_os = "yes" ]] || [[ $encrypt_home = "yes" ]]; then
......@@ -561,7 +571,7 @@ yad --title=$"Install GRUB bootloader" --center --text=$" Choose a location to
answer="$?"
if [[ $answer = 0 ]] ; then
grub_dev=$(find /dev -mindepth 1 -maxdepth 1 -name "*[sh]d[a-z]" \
grub_dev=$(find /dev -mindepth 1 -maxdepth 1 | egrep "*[sh]d[a-z]$|*nvme[0-9]n[0-9]$|*mmcblk[0-9]$" \
| sort | awk '{print "\n" $0 }' \
| yad --list --separator="" --title=$"Bootloader" --center --text=$"Choose a location to install the bootloader.
" \
......@@ -584,7 +594,7 @@ grub_dev=$(find /dev -mindepth 1 -maxdepth 1 -name "*[sh]d[a-z]" \
fi
elif [[ $answer = 1 ]] ; then
grub_partition=$(find /dev -mindepth 1 -maxdepth 1 -name "*[sh]d[a-z][1-9]*" \
grub_partition=$(find /dev -mindepth 1 -maxdepth 1 | egrep "*[sh]d[a-z][1-99]|*nvme[0-9]n[0-9]p[1-99]|*mmcblk[0-9]p[1-99]" \
| sort | awk '{print "\n" $0 }' \
| yad --list --title=$"Bootloader" --center --text=$"Select a partition for the bootloader (GRUB)." \
--separator="" --column ' ' --column $'Partitions' --height=380 --width=150)
......@@ -652,6 +662,10 @@ choose_esp () {
else
esp_dev=$(yad --entry --text=$"Warning: Something odd is going on. It looks like you have more than one EFI partition.\nIf you are sure you know which is the correct one, enter the device name below.\nNormally it should be /dev/sda1\n\n$esp_info\n" \
--button=$"OK":0 --button=$"Abort":1 --width=600)
answer="$?"
if [[ $answer = 1 ]] ; then
exit 0
fi
fi
}
......@@ -1613,23 +1627,23 @@ Abort: will exit the installer and abort the installation.
" \
"${magic_button4}" "${magic_button}" --button=$"Abort":2 --button=$"Chroot":1 --button=$"Continue":0
ret="$?"
answer="$?"
if [[ $ret -eq 1 ]] ; then
if [[ $answer -eq 1 ]] ; then
chroot_terminal
fi
if [[ ret -eq 2 ]] ; then
if [[ $answer -eq 2 ]] ; then
cleanup
exit 0
fi
if [[ ret -eq 3 ]] ; then
if [[ $answer -eq 3 ]] ; then
chroot /target grub-install # --bootloader-id="$some-name" (default comes from where? maybe /etc/default/grub, maybe lsb_release.)
chroot /target update-grub
fi
if [[ ret -eq 4 ]] ; then
if [[ $answer -eq 4 ]] ; then
grub_packages=$(yad --file --multiple --title=$"GRUB Packages" \
--text=$"Select the grub-efi-amd64 packages.\n\nBoth grub-efi packages will be copied to /target." \
--height=400 --width=500 --separator ' ')
......
......@@ -14,9 +14,9 @@ fi
if [[ -d /sys/firmware/efi ]]; then
installer="/usr/bin/refractainstaller-uefi"
installer="/usr/bin/refractainstaller-uefi -d"
else
installer="/usr/bin/refractainstaller-yad"
installer="/usr/bin/refractainstaller-yad -d"
fi
......
#!/usr/bin/env bash
version="Refracta Installer (Yad) 9.2.1 (20170216)"
version="Refracta Installer (Yad) 9.2.3 (20170601)"
TEXTDOMAIN=refractainstaller-gui
TEXTDOMAINDIR=/usr/share/locale/
......@@ -190,8 +190,8 @@ fi
# Greeting window
yad --title="$window_title" --width=480 --button=$"Simple installation":0 \
--button=$"Expert installation":1 --button=$"Exit":2 --center \
yad --title="$window_title" --width=480 \
--button=$"Continue":0 --button=$"Exit":1 --center \
--text=$"$live_session_warning
This utility will install a running live-CD or live-USB to your hard drive.
......@@ -200,15 +200,14 @@ yad --title="$window_title" --width=480 --button=$"Simple installation":0 \
type, including but not limited to express, implied, merchantability or
fitness of purpose.
Copyright 2011-2015 fsmithred@gmail.com,
Copyright 2011-2017 fsmithred@gmail.com,
based on refractainstaller-8.0.3 by Dean Linkous. \n Version: $version \n\n\
${custom_text} \n
"
mode="$?"
case $mode in
0) install="simple" ;;
1) install="expert" ;;
2) exit 0 ;;
0) install="expert" ;;
1) exit 0 ;;
esac
......@@ -258,6 +257,8 @@ copy_excludes () {
- /etc/mtab
- /home/snapshot/
- /home/*/.gvfs
- /var/lib/dbus/machine-id
- /etc/popularity-contest.conf
# Added for newer version of live-config/live-boot
# in sid (to become Jessie)
......@@ -267,6 +268,12 @@ copy_excludes () {
- /lib/live/mount
- /run/*
# Added for symlink /lib
- /usr/lib/live/overlay
- /usr/lib/live/image
- /usr/lib/live/rootfs
- /usr/lib/live/mount
EOF
chmod 666 "$rsync_excludes"
......@@ -391,6 +398,8 @@ if $(echo $opts | grep -q 09); then
else
no_format="yes"
fi
else
no_format="" # just in case config file is set to yes.
fi
if $(echo $opts | grep -q 10) || [ "$use_uuid" = "yes" ]; then
if [[ $encrypt_os = "yes" ]] || [[ $encrypt_home = "yes" ]]; then
......
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