From f24ece0c5338d68efd88bd0a15a0550949b56b8c Mon Sep 17 00:00:00 2001 From: Linux-is-king <121989185+Linux-is-king@users.noreply.github.com> Date: Sun, 29 Jan 2023 19:08:22 -1000 Subject: [PATCH] sending another pull request I am submitting another pull request, I believe there is a lot of confusion mostly coming from the variable names.. to be clear puppyinstaller works with efi in frugal mode.. the "fullinstall" button launches the puppyinstaller to do a frugal install.. full install is locked some how .. read the begging of the script. any ways I have fixed the puppyinstaller and can confirm it now works with efi, bdrv, as well as non-bdrv pups .. please read the commits. I also still left the grub for dos check disabled, read comment to understand why I believe that needs to be done, but if nothing else please implement the other changes... --- woof-code/rootfs-skeleton/usr/sbin/dotpup | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/woof-code/rootfs-skeleton/usr/sbin/dotpup b/woof-code/rootfs-skeleton/usr/sbin/dotpup index 3a5e8e48ca9..2faf1bedd4e 100755 --- a/woof-code/rootfs-skeleton/usr/sbin/dotpup +++ b/woof-code/rootfs-skeleton/usr/sbin/dotpup @@ -38,7 +38,7 @@ install_button() { #text1 text2 action icon ' } - +#not sure what this does, there is no frugalpup script in sbin ? this may also be cauing confusion nor does it show when ran ?? if type frugalpup 1>/dev/null 2>&1 ; then FRUGALPUP_BUTTON=$(install_button \ "$(gettext "Frugalpup - Install/manage installs")" \ @@ -50,14 +50,16 @@ BOOTFLASHBUTTON=$(install_button \ "$(gettext "BootFlash")" \ "$(gettext "Quickly create a bootable usb flash drive")" \ 'bootflash &' flashcard_usb.svg ) - -if [ -d /usr/share/g4dos -o -f /usr/local/frugalpup/grub4dos.tar.xz -o -f /usr/lib/grub4dos/grldr ] ; then +#this bit of code still neads a lot of work, for one it dosen's launch a full install ( as the name "FULLINSTALLBUTTON" would make you think.) it loads the puppyinstaller, which is used for both frugal and full hard drive installs (full install dosent work with uefi, while frugal does) +#this also does not check to see if grub2 is already installed on the machine. ( most people who use grub 2 do all changes to the boot menu through a specific linux install). +#the code above adds to this confusin... +#since this does not check for grub2, nor does it check to see if grab is on the efi it shouldnt be here... ( Why not simiply include grub4dos ? ), or add code to fix this ? +#if [ -d /usr/share/g4dos -o -f /usr/local/frugalpup/grub4dos.tar.xz -o -f /usr/lib/grub4dos/grldr ] ; then FULLINSTALLBUTTON=$(install_button \ "$(gettext "Installer")" \ "$(gettext "Currently doesn't support UEFI")" \ 'puppyinstaller &' puppy_install.svg) -fi - +#fi if [ -e /dev/sr0 ] && [ -x /usr/bin/cdrecord -o -x /usr/bin/xorriso ] ; then BURNISOBUTTON=$(install_button \ "$(gettext "Burn ISO to CD/DVD")" \