From e007815609ae4e2a0f2f186020bdfe5c228cd1ff Mon Sep 17 00:00:00 2001 From: Valeria Fadeeva Date: Sat, 27 Jan 2024 23:26:10 +0500 Subject: [PATCH] Update --- .github/FUNDING.yml | 15 ------------ etc/melawy-linux-release | 1 + usr/bin/melawy-hooks-runner | 47 +++++++++++++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 15 deletions(-) delete mode 100755 .github/FUNDING.yml mode change 100755 => 100644 usr/bin/melawy-hooks-runner diff --git a/.github/FUNDING.yml b/.github/FUNDING.yml deleted file mode 100755 index 77389e0..0000000 --- a/.github/FUNDING.yml +++ /dev/null @@ -1,15 +0,0 @@ -# These are supported funding model platforms - -#github: # Replace with up to 4 GitHub Sponsors-enabled usernames e.g., [user1, user2] - -#patreon: # Replace with a single Patreon username -#open_collective: # Replace with a single Open Collective username -#ko_fi: # Replace with a single Ko-fi username -#tidelift: # Replace with a single Tidelift platform-name/package-name e.g., npm/babel -#community_bridge: # Replace with a single Community Bridge project-name e.g., cloud-foundry -#liberapay: # Replace with a single Liberapay username -#issuehunt: # Replace with a single IssueHunt username -#otechie: # Replace with a single Otechie username -#custom: # Replace with up to 4 custom sponsorship URLs e.g., ['link1', 'link2'] -#github: [Valeria-Fadeeva] -custom: ["https://www.tinkoff.ru/rm/fadeeva.valeriya96/9bLRi79066", "https://yoomoney.ru/to/4100115921160758", "https://qiwi.com/n/VALERIAFADEEVA", "valeria.fadeeva.me"] diff --git a/etc/melawy-linux-release b/etc/melawy-linux-release index cab277f..4317063 100644 --- a/etc/melawy-linux-release +++ b/etc/melawy-linux-release @@ -2,3 +2,4 @@ LSB_VERSION=2.0 DISTRIB_ID="Melawy Linux" DISTRIB_RELEASE="rolling" DISTRIB_DESCRIPTION="Melawy Linux" +DISTRIB_CODENAME="rolling" diff --git a/usr/bin/melawy-hooks-runner b/usr/bin/melawy-hooks-runner old mode 100755 new mode 100644 index 724972a..16be605 --- a/usr/bin/melawy-hooks-runner +++ b/usr/bin/melawy-hooks-runner @@ -4,6 +4,11 @@ Lsb_release() { local file=/etc/lsb-release + local melawyfile=/etc/melawy-linux-release + + if [ -f "$melawyfile" ]; then + cp "$melawyfile" "$file" + fi if [ -z "$(grep "^DISTRIB_CODENAME=" $file)" ] ; then # add missing DISTRIB_CODENAME= @@ -56,6 +61,47 @@ Issues() { sed -i -e 's/[a-Z].*/Melawy Linux \\r (\\l)/' /etc/issue /usr/share/factory/etc/issue } +Motd() { +MOTD=$( +cat <<'EOF' +This ISO is based on Arch-ISO modified hugely to provide Installation Environment for Melawy Linux. +https://melawy.ru + +Melawy Linux-archiso Sources: +https://gitlab.com/melawy + +Arch-ISO Source: +https://gitlab.archlinux.org/archlinux/archiso + +Calamares as our installer: +https://github.com/calamares/calamares + +Live environment will start now and let you install Melawy Linux to disk, or tryout KDE-Desktop from Live-Session. + +Getting help: +https://melawy.ru +https://sourceforge.net/projects/melawy-linux/support + +Bugs can be reported here: +https://sourceforge.net/projects/melawy-linux/support + +Our journey wouldn't be made possible without the donates: +https://melawy.ru/donate + +Thank you for donating your trust in us! + +Welcome to your Melawy Linux + +------------------ + +EOF +) + +if [ -f /etc/motd ]; then + echo "$MOTD" > /etc/motd +fi +} + Main() { local hookname="$1" @@ -68,6 +114,7 @@ Main() "") Os_release Lsb_release Issues + Motd ;; esac }