tazusb rev 124
tazusb: use /lib/libtaz.sh
author | Christophe Lincoln <pankso@slitaz.org> |
---|---|
date | Sun Apr 15 17:41:46 2012 +0200 (2012-04-15) |
parents | 80ac05ac98e3 |
children | a5f5b6aad358 |
files | tazusb |
line diff
1.1 --- a/tazusb Mon Apr 09 18:34:02 2012 +0200 1.2 +++ b/tazusb Sun Apr 15 17:41:46 2012 +0200 1.3 @@ -10,6 +10,8 @@ 1.4 # 1.5 VERSION=4.0.1 1.6 1.7 +. /lib/libtaz.sh 1.8 + 1.9 # Include gettext helper script. 1.10 . /usr/bin/gettext.sh 1.11 1.12 @@ -19,7 +21,7 @@ 1.13 1.14 COMMAND=$1 1.15 TARGET_ROOT=/media/flash 1.16 -DRIVE_NAME=`cat /proc/sys/dev/cdrom/info | grep "drive name" | cut -f 3` 1.17 +DRIVE_NAME=$(cat /proc/sys/dev/cdrom/info | grep "drive name" | cut -f 3) 1.18 CDROM=/dev/$DRIVE_NAME 1.19 LOG=/tmp/$(basename $0).log 1.20 1.21 @@ -27,9 +29,6 @@ 1.22 # Tazusb functions 1.23 # 1.24 1.25 -source /usr/lib/slitaz/libtaz 1.26 -source_lib commons 1.27 - 1.28 # Print the usage. 1.29 usage () 1.30 { 1.31 @@ -62,10 +61,10 @@ 1.32 Please specify the target USB device to $COMMAND. You can type 'list' to 1.33 get a list of devices, type 'exit' or give an empty value to exit. 1.34 1.35 -Device to use : "; read anser 1.36 +Device to use: "; read anser 1.37 while [ "$anser" == "list" ]; do 1.38 fdisk_list 1.39 - gettext "Device to use : "; read anser 1.40 + gettext "Device to use: "; read anser 1.41 done 1.42 if [ "$anser" = "" -o "$anser" = "exit" ]; then 1.43 echo "" 1.44 @@ -110,7 +109,6 @@ 1.45 gettext "Mkfs : mkfs.ext3 -L \"$label\" $DEVICE" ; echo "" 1.46 echo "" && sleep 2 1.47 mkfs.ext3 -L "$label" $DEVICE 1.48 - 1.49 } 1.50 1.51 # Get label for device 1.52 @@ -118,7 +116,6 @@ 1.53 { 1.54 gettext "Please specify a label for the partition (TazUSB): " 1.55 read label 1.56 - 1.57 if [ -z $label ]; then 1.58 label=TazUSB 1.59 fi 1.60 @@ -129,7 +126,6 @@ 1.61 { 1.62 gettext "Please specify a filesystem type ext2, ext3 or fat32 (ext3): " 1.63 read fs_type 1.64 - 1.65 if [ -z $fs_type ]; then 1.66 fs_type=ext3 1.67 fi 1.68 @@ -143,7 +139,7 @@ 1.69 Available formats are ext3(default), ext2 or fat32. 1.70 Press enter to keep the default value. 1.71 1.72 -File system type : "; read anser 1.73 +File system type: "; read anser 1.74 if [ "$anser" = "" ]; then 1.75 FS_TYPE=ext3 1.76 else 1.77 @@ -322,19 +318,16 @@ 1.78 # Let user exit or reboot. 1.79 exit_or_reboot() 1.80 { 1.81 - echo "===============================================================================" 1.82 + separator 1.83 echo "" 1.84 gettext "Do you want to exit Tazusb or reboot system (Exit/reboot) ? " 1.85 read anser 1.86 if [ "$anser" == "reboot" ]; then 1.87 - umount $TARGET_ROOT 1.88 - umount /media/cdrom 1.89 + unmount_target_usb 1.90 reboot || reboot -f 1.91 else 1.92 - umount $TARGET_ROOT 1.93 - umount /media/cdrom 1.94 - echo "" 1.95 - exit 0 1.96 + unmount_target_usb 1.97 + echo "" && exit 0 1.98 fi 1.99 } 1.100 1.101 @@ -503,7 +496,7 @@ 1.102 gettext "rootfs.gz is located in /"; echo "" 1.103 fi 1.104 1.105 - echo "===============================================================================" 1.106 + separator 1.107 gettext "Root filesystem size: $size"; echo "" 1.108 echo "" 1.109 echo "----" 1.110 @@ -514,7 +507,7 @@ 1.111 check_root 1.112 echo "" 1.113 echo -e "\033[1m`gettext \"Format a device\"`\033[0m" 1.114 - echo "===============================================================================" 1.115 + separator 1.116 DEVICE=$2 1.117 label=$3 1.118 fs_type=$4 1.119 @@ -529,7 +522,7 @@ 1.120 unmount_target_usb 1.121 make_fs "$fs_type" 1.122 # mkfs_ext3 1.123 - echo "===============================================================================" 1.124 + separator 1.125 gettext "Device $label ($DEVICE) is ready to use as LiveUSB and/or /home partition." 1.126 echo "" 1.127 ;; 1.128 @@ -538,7 +531,7 @@ 1.129 check_root 1.130 echo "" 1.131 echo -e "\033[1m`gettext \"Gen a LiveUSB media\"`\033[0m" 1.132 - echo "===============================================================================" 1.133 + separator 1.134 DEVICE=$2 1.135 if [ -z $DEVICE ]; then 1.136 ask_for_device 1.137 @@ -557,11 +550,9 @@ 1.138 ;; 1.139 gen-swap) 1.140 check_root 1.141 - gen_swap_file 1.142 - ;; 1.143 + gen_swap_file ;; 1.144 gen-iso2usb|iso2usb) 1.145 check_root 1.146 - 1.147 # Check if file exists 1.148 ISO=$2 1.149 if [ -z $ISO ] || [ ! -f $ISO ]; then 1.150 @@ -569,9 +560,8 @@ 1.151 exit 1 1.152 fi 1.153 echo "" 1.154 - echo -e "\033[1m`gettext \"Copy ISO file to SliTaz LiveUSB media\"`\033[0m" 1.155 - echo "===============================================================================" 1.156 - echo "" 1.157 + boldify "$(gettext "Copy ISO file to SliTaz LiveUSB media")" 1.158 + separator 1.159 DEVICE=$3 1.160 if [ -z $DEVICE ]; then 1.161 ask_for_device