xstefen/al-installer
Archived
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move outdated translations to a subdir, update readme

Browse Source
This commit is contained in:
natemaia
2019-01-18 21:55:47 -08:00
parent 5c8bd58dfc
commit 5f2d2ba885
12 changed files with 30 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
src/archlabs-installer
View File

@ -8,7 +8,7 @@
# Some ideas and code has been taken from other installers
# AIF, Cnichi, Calamares, The Arch Wiki.. Credit where credit is due
VER="1.8.36" # version
VER="1.8.37" # version
DIST="ArchLabs" # distributor
MNT="/mnt" # install mountpoint
@ -261,8 +261,7 @@ show_cfg()
{
local cmd="${BCMDS[$BOOTLDR]}"
local mnt="${BMNTS[$SYS-$BOOTLDR]}"
local pkgs="${USER_PKGS# } ${PACKAGES# } $BASE_PKGS"
[[ $PACKAGES =~ (openbox|bspwm|i3-gaps) || $INSTALL_WMS == *dwm* ]] && pkgs="${pkgs# } $WM_BASE_PKGS"
local pkgs="${USER_PKGS# } ${PACKAGES# }"
[[ $INSTALL_WMS == *dwm* ]] && pkgs="dwm st dmenu ${pkgs# }"
pkgs="${pkgs# }"
pkgs="${pkgs% }"
@ -504,6 +503,8 @@ select_sessions()
for i in $WM_PACKAGES; do
[[ $PACKAGES == *$i* ]] || PACKAGES+=" ${WM_PACKAGES# }"
done
return 0
}
select_login()
@ -879,7 +880,7 @@ partition()
elif [[ $choice != "$_PartWipe" && $choice != "$_PartAuto" && $choice != "$_PartShowTree" ]]; then
clear; tput cnorm; $choice "$device"; partition "$device"
elif [[ $choice == "$_PartShowTree" ]]; then
msgbox "$_PartTitle" "\n$(lsblk -o NAME,MODEL,TYPE,FSTYPE,SIZE,MOUNTPOINT "$device")\n"
msgbox "$_PartTitle" "\n\n$(lsblk -o NAME,MODEL,SIZE,TYPE,FSTYPE,MOUNTPOINT "$device")\n\n"
partition "$device"
elif [[ $choice == "$_PartWipe" ]]; then
yesno "$_PartWipe" "$_PartBody1 $device $_PartWipeBody" && wipe -Ifrev $device
@ -939,13 +940,13 @@ device_tree()
tput civis
local msg
if [[ $IGNORE_DEV != "" ]]; then
msg="$(lsblk -o NAME,MODEL,TYPE,FSTYPE,SIZE,MOUNTPOINT |
msg="$(lsblk -o NAME,MODEL,SIZE,TYPE,FSTYPE,MOUNTPOINT |
awk "!/$IGNORE_DEV/"' && /disk|part|lvm|crypt|NAME/')"
else
msg="$(lsblk -o NAME,MODEL,TYPE,FSTYPE,SIZE,MOUNTPOINT |
msg="$(lsblk -o NAME,MODEL,SIZE,TYPE,FSTYPE,MOUNTPOINT |
awk '/disk|part|lvm|crypt|NAME/')"
fi
msgbox "$_PrepShowDev" "$msg"
msgbox "$_PrepShowDev" "\n\n$msg\n\n"
}
select_device()
@ -1074,7 +1075,7 @@ auto_partition()
tput civis
sleep 0.5
msgbox "$_PrepParts" "\nAuto partitioning complete.\n\n$(lsblk -o NAME,MODEL,TYPE,FSTYPE,SIZE $device)"
msgbox "$_PrepParts" "\nAuto partitioning complete.\n\n$(lsblk -o NAME,MODEL,SIZE,TYPE,FSTYPE $device)\n"
}
mount_partition()
@ -2293,7 +2294,7 @@ luks_show()
{
tput civis
sleep 0.5
msgbox "$_LuksEncrypt" "${_LuksEncryptSucc}\n$(lsblk $LUKS_PART -o NAME,MODEL,TYPE,FSTYPE,SIZE)\n"
msgbox "$_LuksEncrypt" "${_LuksEncryptSucc}\n\n$(lsblk $LUKS_PART -o NAME,MODEL,SIZE,TYPE,FSTYPE)\n\n"
}
luks_keyfile()
@ -2329,15 +2330,6 @@ json()
curl -s "http://api.ipstack.com/$2" | python3 -c "import sys, json; print(json.load(sys.stdin)['$1'])"
}
src()
{
if ! . "$1" 2>/dev/null; then
printf "Failed to source file %s\n" "$1"
die 1
fi
return 0
}
is_ssd()
{
local i dev=$1
@ -2626,12 +2618,16 @@ for arg in "$@"; do
[[ $arg =~ (--debug|-d) ]] && debug
done
src /usr/share/archlabs/installer/lang/english.trans
if ! . /usr/share/archlabs/installer/lang/english.trans 2>/dev/null; then
printf "Failed to source dialog text file\n"
die 1
fi
system_checks
system_identify
system_devices
msgbox "$_WelTitle $DIST Installer" "$_WelBody"
select_keymap || die 0
select_keymap || { clear; die 0; }
while true; do
main