diff --git a/airootfs/etc/xdg/kcm-about-distrorc b/airootfs/etc/xdg/kcm-about-distrorc deleted file mode 100644 index 67d558c..0000000 --- a/airootfs/etc/xdg/kcm-about-distrorc +++ /dev/null @@ -1,4 +0,0 @@ -[General] -Name="Melawy Linux" -LogoPath=/usr/share/logos/melawy-linux.png -Website=https://melawy.ru/ diff --git a/airootfs/usr/local/bin/calamares-offline.sh b/airootfs/usr/local/bin/calamares-offline similarity index 100% rename from airootfs/usr/local/bin/calamares-offline.sh rename to airootfs/usr/local/bin/calamares-offline diff --git a/airootfs/usr/local/bin/calamares-online.sh b/airootfs/usr/local/bin/calamares-online similarity index 96% rename from airootfs/usr/local/bin/calamares-online.sh rename to airootfs/usr/local/bin/calamares-online index aff9da2..dbfe303 100755 --- a/airootfs/usr/local/bin/calamares-online.sh +++ b/airootfs/usr/local/bin/calamares-online @@ -32,8 +32,8 @@ Main() { local mode="" case "$progname" in - calamares-online.sh) mode=online ;; - calamares-offline.sh) mode=offline ;; + calamares-online) mode=online ;; + calamares-offline) mode=offline ;; esac mode=online # keep this line for now! diff --git a/airootfs/usr/local/bin/dmcheck b/airootfs/usr/local/bin/dmcheck index 89ce7da..e625104 100755 --- a/airootfs/usr/local/bin/dmcheck +++ b/airootfs/usr/local/bin/dmcheck @@ -1,15 +1,20 @@ -#!/usr/bin/env bash +#!/bin/bash #set -e -############################################################################### -# Author : Valeria Fadeeva -# Website : https://valeria.fadeeva.me -# Website : https://fadeeva.me -# Website : https://melawy.ru -############################################################################### +################################################################################################################## +# Author : Erik Dubois +# Website : https://www.erikdubois.be +# Website : https://www.alci.online +# Website : https://www.arcolinux.info +# Website : https://www.arcolinux.com +# Website : https://www.arcolinuxd.com +# Website : https://www.arcolinuxb.com +# Website : https://www.arcolinuxiso.com +# Website : https://www.arcolinuxforum.com +################################################################################################################## # # DO NOT JUST RUN THIS. EXAMINE AND JUDGE. RUN AT YOUR OWN RISK. # -############################################################################### +################################################################################################################## package=ly if pacman -Qs $package > /dev/null ; then diff --git a/airootfs/usr/local/bin/prepare-live-desktop.sh b/airootfs/usr/local/bin/prepare-live-desktop similarity index 100% rename from airootfs/usr/local/bin/prepare-live-desktop.sh rename to airootfs/usr/local/bin/prepare-live-desktop diff --git a/airootfs/usr/local/bin/removeun b/airootfs/usr/local/bin/removeun index 5154a85..a841bc7 100755 --- a/airootfs/usr/local/bin/removeun +++ b/airootfs/usr/local/bin/removeun @@ -6,7 +6,7 @@ local _files_to_remove=( /etc/modprobe.d/nvidia-utils.conf /etc/modules-load.d/nvidia-utils.conf /usr/local/bin/choose-mirror - /usr/local/bin/prepare-live-desktop.sh + /usr/local/bin/prepare-live-desktop /usr/local/bin/removeun-online /usr/local/share/livecd-sound ) diff --git a/airootfs/usr/share/logos/melawy-linux.png b/airootfs/usr/share/logos/melawy-linux.png deleted file mode 100644 index cb94626..0000000 Binary files a/airootfs/usr/share/logos/melawy-linux.png and /dev/null differ diff --git a/airootfs/usr/share/pixmaps/melawy-linux.png b/airootfs/usr/share/pixmaps/melawy-linux.png deleted file mode 100644 index cb94626..0000000 Binary files a/airootfs/usr/share/pixmaps/melawy-linux.png and /dev/null differ diff --git a/airootfs/var/lib/AccountsService/icons/liveuser b/airootfs/var/lib/AccountsService/icons/liveuser deleted file mode 100644 index 9cc0804..0000000 Binary files a/airootfs/var/lib/AccountsService/icons/liveuser and /dev/null differ diff --git a/packages.x86_64 b/packages.x86_64 index a61e17f..2a00c36 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -407,6 +407,8 @@ snapd-glib appimagelauncher ocs-url +discover + gvfs gvfs-afc gvfs-gphoto2 @@ -651,6 +653,8 @@ yaml-language-server ## Melawy REPO +melawy-hooks +melawy-branding melawy-arch-linux-updater melawy-plasma-plasmoid-archupdate @@ -659,7 +663,7 @@ melawy-dracut-initramfs melawy-dracut-ukify melawy-refind-menu-generator melawy-etc-skel-std-powerman -melawy-hooks + melawy-plasma-plasmoid-DittoMenu melawy-plasma-plasmoid-Menu11 diff --git a/profiledef.sh b/profiledef.sh index e301c15..28e32dd 100644 --- a/profiledef.sh +++ b/profiledef.sh @@ -24,16 +24,16 @@ file_permissions=( ["/etc/sudoers.d"]="0:0:750" ["/etc/sudoers.d/g_wheel"]="0:0:440" ["/root"]="0:0:750" - ["/root/.automated_script.sh"]="0:0:755" + ["/root/.automated_script"]="0:0:755" ["/usr/bin/GPU-Intel-installer"]="0:0:755" ["/usr/local/bin/Installation_guide"]="0:0:755" - ["/usr/local/bin/calamares-offline.sh"]="0:0:755" - ["/usr/local/bin/calamares-online.sh"]="0:0:755" + ["/usr/local/bin/calamares-offline"]="0:0:755" + ["/usr/local/bin/calamares-online"]="0:0:755" ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/dmcheck"]="0:0:755" ["/usr/local/bin/fix-keys"]="0:0:755" ["/usr/local/bin/livecd-sound"]="0:0:755" - ["/usr/local/bin/prepare-live-desktop.sh"]="0:0:755" + ["/usr/local/bin/prepare-live-desktop"]="0:0:755" ["/usr/local/bin/remove-virtual-machine-pkgs"]="0:0:755" ["/usr/local/bin/removeun"]="0:0:755" ["/usr/local/bin/removeun-online"]="0:0:755"