diff options
| author | Dave Hodgins <davidwhodgins@mageia.org> | 2013-10-15 23:40:45 -0400 |
|---|---|---|
| committer | Dave Hodgins <davidwhodgins@mageia.org> | 2013-10-15 23:40:45 -0400 |
| commit | 504e3d6f6e2bb2b72588d9475c61a4525857e146 (patch) | |
| tree | d271a98330d2c82ca370bf60c3c87d92b874aa1c /copyiso2usb | |
| parent | c667bdad41aae5c8e7ccd2d87933a02c82c10b0f (diff) | |
| download | copyiso2usb-504e3d6f6e2bb2b72588d9475c61a4525857e146.tar copyiso2usb-504e3d6f6e2bb2b72588d9475c61a4525857e146.tar.gz copyiso2usb-504e3d6f6e2bb2b72588d9475c61a4525857e146.tar.bz2 copyiso2usb-504e3d6f6e2bb2b72588d9475c61a4525857e146.tar.xz copyiso2usb-504e3d6f6e2bb2b72588d9475c61a4525857e146.zip | |
Only use dialog, not Xdialog, due to errors from things like fontconfig. Change listusbdrives to work on more systems
Diffstat (limited to 'copyiso2usb')
| -rwxr-xr-x | copyiso2usb | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/copyiso2usb b/copyiso2usb index 7ccb82c..79205d0 100755 --- a/copyiso2usb +++ b/copyiso2usb @@ -64,11 +64,11 @@ if [ ! "unset" = "$pktest" ] ; then fi # Set dialog command to use -dialogcmd="/usr/bin/Xdialog" -displaytest=${DISPLAY-"unset"} -if [ ! -e /usr/bin/Xdialog ] || [ ! -x /usr/bin/Xdialog ] || [ "unset" = "$displaytest" ] ; then +#dialogcmd="/usr/bin/Xdialog" #Removed after finding errors from things like fontconfig can cause problems. +#displaytest=${DISPLAY-"unset"} +#if [ ! -e /usr/bin/Xdialog ] || [ ! -x /usr/bin/Xdialog ] || [ "unset" = "$displaytest" ] ; then dialogcmd="/usr/bin/dialog" -fi +#fi # Function to get window size GetDisplaySize() { @@ -82,7 +82,7 @@ GetDisplaySize # Function to list all usb drives listusbdrives () { - for block in /sys/devices/pci*/*/usb*/*/*/host*/target*/*/block/sd*; do + for block in $(tree -if /sys/devices|grep usb|grep /block/sd\[a-z\]\$); do device=${block##*/} # strip last slash and everything before it. printf '%s\n' "$device" done |