Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

sending another pull request #3879

Open
wants to merge 1 commit into
base: testing
Choose a base branch
from
Open

sending another pull request #3879

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions woof-code/rootfs-skeleton/usr/sbin/dotpup
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ install_button() { #text1 text2 action icon
</hbox>
'
}

#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")" \
Expand All @@ -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")" \
Expand Down