SliTaz Repositories

     1.1 --- a/syslinux/stuff/iso2exe/taziso	Thu May 28 08:35:55 2020 +0000
     1.2 +++ b/syslinux/stuff/iso2exe/taziso	Sun May 31 14:59:28 2020 +0000
     1.3 @@ -1,6 +1,6 @@
     1.4  #!/bin/sh
     1.5  
     1.6 -[ $(id -u) -eq 0 ] || exec su -c "$0 $@"
     1.7 +[ 0$(id -u 2>/dev/null) -eq 0 ] || exec su -c "$0 $@"
     1.8  
     1.9  DIALOG=dialog
    1.10  
    1.11 @@ -11,7 +11,6 @@
    1.12  
    1.13  get()
    1.14  {
    1.15 -	od -v -j $1 -N ${4:-${3:-2}} -t u${3:-2} -w${3:-2} -An "$2" 2>/dev/null ||
    1.16  	hexdump -v -s $1 -n ${4:-${3:-2}} -e "\"\" 1/${3:-2} \" %u\n\"" "$2"
    1.17  }
    1.18  
    1.19 @@ -58,6 +57,7 @@
    1.20  	esac < $i | ( cd ${2:-/} ; cpio -idmu > /dev/null 2>&1 )
    1.21  }
    1.22  
    1.23 +xdotwait=dotwait
    1.24  dotwait()
    1.25  {
    1.26  	echo -n "${1:-Install filesystem}.."
    1.27 @@ -929,6 +929,7 @@
    1.28  	hascustomconf $(($c+16)) && echo $(($c+16)) || echo $c
    1.29  }
    1.30  
    1.31 +xhascustomconf=hascustomconf
    1.32  hascustomconf()
    1.33  {
    1.34  	[ "$(ddq bs=2k skip=${1:-$(customsector)} if="$ISO" | ddq bs=1 count=6)" \
    1.35 @@ -1158,7 +1159,7 @@
    1.36  
    1.37  hasflavinfo()
    1.38  {
    1.39 -	[ "$(flavdata | ddq bs=1 count=7 | strings)" = \
    1.40 +	[ "$(flavdata | ddq bs=1 count=7)" = \
    1.41  	  "0707010" ] && menuitem "$@"
    1.42  }
    1.43