--- trunk/installer/include/prepare_disks.sh 2010/05/30 23:08:38 1046 +++ trunk/installer/include/prepare_disks.sh 2010/05/30 23:08:59 1047 @@ -11,6 +11,7 @@ local disk_fs local opts local progress + local percent declare -i progress=0 @@ -34,7 +35,14 @@ fi (( progress++ )) - echo ${progress} 9 | awk '{print ($1 / $2 * 100) - 1}' + percent=$(echo ${progress} 9 | awk '{print ($1 / $2 * 100) - 1}') + if [[ ${GUITYPE} = ncurses ]] + then + # no floats in ncurses gui possible + printf %.0f "${percent}" + else + echo "${percent}" + fi done echo "100" @@ -107,3 +115,9 @@ --umount | -u ) umount_disks ;; *) echo "unknown option '$1'." ;; esac + +case $2 in + --ncurses) GUITYPE="ncurses" ;; + --gtk) GUITYPE="gtk" ;; + *) GUITYPE="gtk" ;; +esac