luisgulo/WhiteSur-gtk-theme
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Differenciate between error and abort signal

Browse source
This commit is contained in:
Muhammad Rivan 2021-06-10 15:54:13 +07:00
parent a384f71c2c
commit 8f97690274
No known key found for this signature in database
GPG key ID: C56A200FD936FAAA
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
lib-core.sh
View file

@ -136,6 +136,8 @@ swupd_packages=""
# '/' ending is required in 'swupd_url' # '/' ending is required in 'swupd_url'
swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/Packages/" swupd_url="https://cdn.download.clearlinux.org/current/x86_64/os/Packages/"
swupd_ver_url="https://cdn.download.clearlinux.org/latest" swupd_ver_url="https://cdn.download.clearlinux.org/latest"
swupd_prepared="false"
xbps_prepared="false"
#------------Decoration-----------# #------------Decoration-----------#
export c_default="\033[0m" export c_default="\033[0m"
@ -147,11 +149,11 @@ export c_red="\033[1;31m"
export c_yellow="\033[1;33m" export c_yellow="\033[1;33m"
anim=( anim=(
"${c_blue}•${c_green}•${c_red}•${c_magenta}• " "${c_blue}•${c_green}•${c_red}•${c_magenta}• "
" ${c_green}•${c_red}•${c_magenta}•${c_blue}• " " ${c_green}•${c_red}•${c_magenta}•${c_blue}• "
" ${c_red}•${c_magenta}•${c_blue}•${c_green}• " " ${c_red}•${c_magenta}•${c_blue}•${c_green}• "
" ${c_magenta}•${c_blue}•${c_green}•${c_red}• " " ${c_magenta}•${c_blue}•${c_green}•${c_red}• "
" ${c_blue}•${c_green}•${c_red}•${c_magenta}• " " ${c_blue}•${c_green}•${c_red}•${c_magenta}•"
) )
############################################################################### ###############################################################################
@ -298,6 +300,12 @@ ask() {
echo -e "${c_default}" echo -e "${c_default}"
} }
confirm() {
while [[ "${!1}" != "y" && "${!1}" != "n" ]]; do
ask ${1} "${2}"
done
}
helpify_title() { helpify_title() {
printf "${c_cyan}%s${c_blue}%s ${c_green}%s\n\n" "Usage: " "$0" "[OPTIONS...]" printf "${c_cyan}%s${c_blue}%s ${c_green}%s\n\n" "Usage: " "$0" "[OPTIONS...]"
printf "${c_cyan}%s\n" "OPTIONS:" printf "${c_cyan}%s\n" "OPTIONS:"
@ -611,8 +619,6 @@ sudo() {
result="1"; WHITESUR_COMMAND="${*}" result="1"; WHITESUR_COMMAND="${*}"
fi fi
echo -e "${c_default}"
return "${result}" return "${result}"
} }

17
lib-install.sh
View file

@ -44,6 +44,8 @@ installation_sorry() {
} }
prepare_swupd() { prepare_swupd() {
[[ "${swupd_prepared}" == "true" ]] && return 0
local remove="" local remove=""
local ver="" local ver=""
local conf="" local conf=""
@ -51,10 +53,7 @@ prepare_swupd() {
if has_command dnf; then if has_command dnf; then
prompt -w "CLEAR LINUX: You have 'dnf' installed in your system. It may break your system especially when you remove a package" prompt -w "CLEAR LINUX: You have 'dnf' installed in your system. It may break your system especially when you remove a package"
confirm remove "CLEAR LINUX: You wanna remove it? (y/n): "
while [[ "${remove}" != "y" && "${remove}" != "n" ]]; do
ask remove "CLEAR LINUX: You wanna remove it? (y/n): "
done
fi fi
if ! sudo swupd update -y; then if ! sudo swupd update -y; then
@ -72,6 +71,8 @@ prepare_swupd() {
if ! has_command bsdtar; then sudo swupd bundle-add libarchive; fi if ! has_command bsdtar; then sudo swupd bundle-add libarchive; fi
if [[ "${remove}" == "y" ]]; then sudo swupd bundle-remove -y dnf; fi if [[ "${remove}" == "y" ]]; then sudo swupd bundle-remove -y dnf; fi
swupd_prepared="true"
} }
install_swupd_packages() { install_swupd_packages() {
@ -87,11 +88,15 @@ install_swupd_packages() {
} }
prepare_xbps() { prepare_xbps() {
[[ "${xbps_prepared}" == "true" ]] && return 0
# 'xbps-install' requires 'xbps' to be always up-to-date # 'xbps-install' requires 'xbps' to be always up-to-date
sudo xbps-install -Syu xbps sudo xbps-install -Syu xbps
# System upgrading can't remove the old kernel files by it self. It eats the # System upgrading can't remove the old kernel files by it self. It eats the
# boot partition and may cause kernel panic when there is no enough space # boot partition and may cause kernel panic when there is no enough space
sudo vkpurge rm all sudo vkpurge rm all
xbps_prepared="true"
} }
install_theme_deps() { install_theme_deps() {
@ -754,8 +759,8 @@ show_nautilus_style_dialog() {
--radiolist "Choose your Nautilus style (default is BigSur-like style):" 15 40 5 \ --radiolist "Choose your Nautilus style (default is BigSur-like style):" 15 40 5 \
0 "${NAUTILUS_STYLE_VARIANTS[0]}" on \ 0 "${NAUTILUS_STYLE_VARIANTS[0]}" on \
1 "${NAUTILUS_STYLE_VARIANTS[1]}" off \ 1 "${NAUTILUS_STYLE_VARIANTS[1]}" off \
1 "${NAUTILUS_STYLE_VARIANTS[2]}" off \ 2 "${NAUTILUS_STYLE_VARIANTS[2]}" off \
2 "${NAUTILUS_STYLE_VARIANTS[3]}" off --output-fd 1 ) 3 "${NAUTILUS_STYLE_VARIANTS[3]}" off --output-fd 1 )
case "$tui" in case "$tui" in
0) nautilus_style="${NAUTILUS_STYLE_VARIANTS[0]}" ;; 0) nautilus_style="${NAUTILUS_STYLE_VARIANTS[0]}" ;;
1) nautilus_style="${NAUTILUS_STYLE_VARIANTS[1]}" ;; 1) nautilus_style="${NAUTILUS_STYLE_VARIANTS[1]}" ;;