Add Clear Linux support

This commit is contained in:
Muhammad Rivan 2021-06-09 23:00:46 +07:00
parent d24df87d7b
commit 09d7d2953e
No known key found for this signature in database
GPG Key ID: C56A200FD936FAAA
2 changed files with 18 additions and 14 deletions

View File

@ -125,7 +125,6 @@ msg=""
final_msg="Run '${0} --help' to explore more customization features!"
notif_msg=""
process_ids=()
error_snippet=""
export ANIM_PID="0"
has_any_error="false"
swupd_packages=""
@ -251,11 +250,11 @@ operation_aborted() {
prompt -e "FOUND :"
for i in "${sources[@]}"; do
lines=($(grep -Fn "${error_snippet:-${BASH_COMMAND}}" "${REPO_DIR}/${i}" | cut -d : -f 1 || echo ""))
lines=($(grep -Fn "${BASH_COMMAND}" "${REPO_DIR}/${i}" | cut -d : -f 1 || echo ""))
prompt -e " >>> ${i}$(IFS=';'; [[ "${lines[*]}" ]] && echo " at ${lines[*]}")"
done
prompt -e "SNIPPET:\n >>> ${error_snippet:-${BASH_COMMAND}}"
prompt -e "SNIPPET:\n >>> ${BASH_COMMAND}"
prompt -e "TRACE :"
for i in "${FUNCNAME[@]}"; do
@ -280,8 +279,9 @@ rootify() {
trap true SIGINT
prompt -w "Executing '$(echo "${@}" | cut -c -35 )...' as root"
if [[ -p /dev/stdin ]] && ! sudo "${@}" < /dev/stdin || ! sudo "${@}"; then
error_snippet="${*}"
if [[ -p /dev/stdin ]] && ! sudo "${@}" < /dev/stdin; then
result=1
elif ! sudo "${@}"; then
result=1
fi
@ -295,8 +295,9 @@ userify() {
trap true SIGINT
if [[ -p /dev/stdin ]] && ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin || ! sudo -u "${MY_USERNAME}" "${@}"; then
error_snippet="${*}"
if [[ -p /dev/stdin ]] && ! sudo -u "${MY_USERNAME}" "${@}" < /dev/stdin; then
result=1
elif ! sudo -u "${MY_USERNAME}" "${@}"; then
result=1
fi

View File

@ -33,7 +33,7 @@ WHITESUR_SOURCE+=("lib-install.sh")
# for installing a util, e.g. 'sassc' (from 'desktop-dev' bundle, or
# 'os-utils-gui-dev' bundle, or any other 'sassc' provider bundle)
# Manual package installation is needed for that, but don't use 'dnf'
# Manual package installation is needed for that, but please don't use 'dnf'
installation_sorry() {
prompt -w "WARNING: We're sorry, your distro isn't officially supported yet."
@ -49,10 +49,12 @@ prepare_swupd() {
local dist=""
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\n"
prompt -w "CLEAR LINUX: You have 'dnf' installed in your system. It may break your system especially when you remove a package"
while [[ "${remove}" != "y" && "${remove}" != "n" ]]; do
read -p "${c_cyan}You wanna remove it? (y/n): ${c_green}" remove 2>&1
echo -e "${c_green}"
read -p "You wanna remove it? (y/n): " remove 2>&1
echo -e "${c_default}"
done
fi
@ -68,6 +70,7 @@ prepare_swupd() {
rootify swupd update -y
fi
if ! has_command bsdtar; then rootify swupd bundle-add libarchive; fi
if [[ "${remove}" == "y" ]]; then rootify swupd bundle-remove -y dnf; fi
}
@ -94,7 +97,7 @@ prepare_xbps() {
install_theme_deps() {
if ! has_command glib-compile-resources || ! has_command sassc || ! has_command xmllint ||
(! is_my_distro "clear-linux" && [[ ! -r "/usr/share/gtk-engines/murrine.xml" ]]); then
prompt -w "\n'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation.\n"
prompt -w "\n 'glib2.0', 'sassc', 'xmllint', and 'libmurrine' are required for theme installation.\n"
if has_command zypper; then
rootify zypper in -y sassc glib2-devel gtk2-engine-murrine libxml2-tools
@ -123,7 +126,7 @@ install_theme_deps() {
install_beggy_deps() {
if ! has_command convert; then
prompt -w "\n'imagemagick' are required for background editing.\n"
prompt -w "\n 'imagemagick' are required for background editing.\n"
if has_command zypper; then
rootify zypper in -y ImageMagick
@ -150,7 +153,7 @@ install_beggy_deps() {
install_dialog_deps() {
if ! has_command dialog; then
prompt -w "\n'dialog' is required for this option.\n"
prompt -w "\n 'dialog' is required for this option.\n"
if has_command zypper; then
rootify zypper in -y dialog
@ -319,7 +322,7 @@ install_theemy() {
desktop_entry+="CursorTheme=WhiteSur-cursors\n"
desktop_entry+="ButtonLayout=close,minimize,maximize:menu\n"
echo "${desktop_entry}" > "${TARGET_DIR}/index.theme"
echo -e "${desktop_entry}" > "${TARGET_DIR}/index.theme"
#--------------------GTK-3.0--------------------#