Clean code

This commit is contained in:
MatMoul 2015-10-10 21:50:48 +02:00
parent 2690ddaebc
commit 417fe5237f

26
archfi
View file

@ -104,16 +104,16 @@ setkeymap(){
3>&1 1>&2 2>&3) 3>&1 1>&2 2>&3)
if [ "$?" = "0" ]; then if [ "$?" = "0" ]; then
clear clear
echo "loadkeys $keymap" #echo "loadkeys $keymap"
loadkeys $keymap loadkeys $keymap
pressanykey #pressanykey
fi fi
} }
rebootpc(){ rebootpc(){
if (whiptail --backtitle "$apptitle" --title "$txtreboot" --yesno "$txtreboot ?" --defaultno 0 0) then if (whiptail --backtitle "$apptitle" --title "$txtreboot" --yesno "$txtreboot ?" --defaultno 0 0) then
clear clear
echo "reboot" #echo "reboot"
reboot reboot
fi fi
} }
@ -190,28 +190,28 @@ diskpartautodos(){
if (whiptail --backtitle "$apptitle" --title "$txtautoparts (dos)" --yesno "${txtautopartsconfirm//%1/$device}" --defaultno 0 0) then if (whiptail --backtitle "$apptitle" --title "$txtautoparts (dos)" --yesno "${txtautopartsconfirm//%1/$device}" --defaultno 0 0) then
clear clear
echo "$txtautopartclear" echo "$txtautopartclear"
echo "parted $device mklabel msdos" #echo "parted $device mklabel msdos"
parted $device mklabel msdos parted $device mklabel msdos
echo "sleep 1" #echo "sleep 1"
sleep 1 sleep 1
echo "${txtautopartcreate//%1/boot}" echo "${txtautopartcreate//%1/boot}"
echo "echo -e \"n\np\n\n\n+512M\na\nw\" | fdisk $device" #echo "echo -e \"n\np\n\n\n+512M\na\nw\" | fdisk $device"
echo -e "n\np\n\n\n+512M\na\nw" | fdisk $device echo -e "n\np\n\n\n+512M\na\nw" | fdisk $device
echo "sleep 1" #echo "sleep 1"
sleep 1 sleep 1
echo "${txtautopartcreate//%1/swap}" echo "${txtautopartcreate//%1/swap}"
echo "swapsize=$(cat /proc/meminfo | grep MemTotal | awk '{ print $2 }')" #echo "swapsize=$(cat /proc/meminfo | grep MemTotal | awk '{ print $2 }')"
swapsize=$(cat /proc/meminfo | grep MemTotal | awk '{ print $2 }') swapsize=$(cat /proc/meminfo | grep MemTotal | awk '{ print $2 }')
echo "swapsize=$(($swapsize/1000))\"M\"" #echo "swapsize=$(($swapsize/1000))\"M\""
swapsize=$(($swapsize/1000))"M" swapsize=$(($swapsize/1000))"M"
echo "echo -e \"n\np\n\n\n+$swapsize\nt\n\n82\nw\" | fdisk $device" #echo "echo -e \"n\np\n\n\n+$swapsize\nt\n\n82\nw\" | fdisk $device"
echo -e "n\np\n\n\n+$swapsize\nt\n\n82\nw" | fdisk $device echo -e "n\np\n\n\n+$swapsize\nt\n\n82\nw" | fdisk $device
echo "sleep 1" #echo "sleep 1"
sleep 1 sleep 1
echo "${txtautopartcreate//%1/root}" echo "${txtautopartcreate//%1/root}"
echo "echo -e \"n\np\n\n\n\nw\" | fdisk $device" #echo "echo -e \"n\np\n\n\n\nw\" | fdisk $device"
echo -e "n\np\n\n\n\nw" | fdisk $device echo -e "n\np\n\n\n\nw" | fdisk $device
echo "sleep 1" #echo "sleep 1"
sleep 1 sleep 1
echo "" echo ""
pressanykey pressanykey