From 4760c909c78241bcaf3d7e83d23cbbc6bd9fbfd9 Mon Sep 17 00:00:00 2001
From: kokkiemouse <kokkiemouse@gmail.com>
Date: Wed, 30 Sep 2020 15:57:58 +0900
Subject: [PATCH] fixed calamares

Signed-off-by: kokkiemouse <kokkiemouse@gmail.com>
---
 .../airootfs/etc/skel/Desktop/calamares.desktop    | 161 +++++++++++++++++++++
 .../etc/skel/Desktop/welcome-to-alter.desktop      |  16 --
 .../airootfs/root/customize_airootfs_serene.sh     |   8 +-
 channels/serene/airootfs/usr/lib/os-release        |  16 --
 4 files changed, 168 insertions(+), 33 deletions(-)
 create mode 100755 channels/serene/airootfs/etc/skel/Desktop/calamares.desktop
 delete mode 100755 channels/serene/airootfs/etc/skel/Desktop/welcome-to-alter.desktop
 delete mode 100644 channels/serene/airootfs/usr/lib/os-release

diff --git a/channels/serene/airootfs/etc/skel/Desktop/calamares.desktop b/channels/serene/airootfs/etc/skel/Desktop/calamares.desktop
new file mode 100755
index 0000000..08d3496
--- /dev/null
+++ b/channels/serene/airootfs/etc/skel/Desktop/calamares.desktop
@@ -0,0 +1,161 @@
+[Desktop Entry]
+Type=Application
+Version=1.0
+Name=Install %OS_NAME%
+GenericName=%OS_NAME% Installer
+Keywords=calamares;serene;linux;installer;
+TryExec=calamares
+Exec=sudo -E /usr/bin/calamares
+Comment=%OS_NAME% Installer - by Calamares
+Icon=/usr/share/icons/hicolor/scalable/apps/calamares.svg
+Terminal=false
+StartupNotify=true
+Type=Application
+Categories=Qt;System;
+X-AppStream-Ignore=true
+
+Name[ar]=تثبيت النظام
+GenericName[ar]=مثبت النظام
+Comment[ar]=كالامارس - مثبت النظام
+Name[as]=চিছটেম ইনস্তল কৰক
+GenericName[as]=চিছটেম ইনস্তলাৰ
+Comment[as]=কেলামাৰেচ — চিছটেম​ ইনস্তলাৰ
+Name[be]=Усталяваць сістэму
+GenericName[be]=Усталёўшчык сістэмы
+Comment[be]=Calamares — усталёўшчык сістэмы
+Name[bg]=Инсталирай системата
+GenericName[bg]=Системен Инсталатор
+Comment[bg]=Calamares — Системен Инсталатор
+Name[ca]=Instal·la el sistema
+GenericName[ca]=Instal·lador de sistema
+Comment[ca]=Calamares — Instal·lador de sistema
+Name[da]=Installér %OS_NAME%
+GenericName[da]=%OS_NAME%installationsprogram
+Comment[da]=Calamares — %OS_NAME%installationsprogram
+Name[de]=%OS_NAME% installieren
+GenericName[de]=Installation des Betriebs%OS_NAME%s
+Comment[de]=Calamares - Installation des Betriebs%OS_NAME%s
+Name[el]=Εγκατάσταση συστήματος
+GenericName[el]=Εγκατάσταση συστήματος
+Comment[el]=Calamares — Εγκατάσταση συστήματος
+Name[en_GB]=Install %OS_NAME%
+GenericName[en_GB]=%OS_NAME% Installer
+Comment[en_GB]=Calamares — %OS_NAME% Installer
+Name[es]=Instalar Sistema
+GenericName[es]=Instalador del Sistema
+Comment[es]=Calamares — Instalador del Sistema
+Name[et]=Paigalda süsteem
+GenericName[et]=Süsteemipaigaldaja
+Comment[et]=Calamares — süsteemipaigaldaja
+Name[eu]=Sistema instalatu
+GenericName[eu]=Sistema instalatzailea
+Comment[eu]=Calamares - sistema instalatzailea
+Name[es_PR]=Instalar el sistema
+Name[fr]=Installer le système
+GenericName[fr]=Installateur système
+Comment[fr]=Calamares - Installateur système
+Name[gl]=Instalación do Sistema
+GenericName[gl]=Instalador de sistemas
+Comment[gl]=Calamares — Instalador de sistemas
+Name[he]=התקנת מערכת
+GenericName[he]=אשף התקנה
+Comment[he]=Calamares - אשף התקנה
+Name[hi]=सिस्टम इंस्टॉल करें
+GenericName[hi]=सिस्टम इंस्टॉलर
+Comment[hi]=Calamares — सिस्टम इंस्टॉलर
+Name[hr]=Instaliraj sustav
+GenericName[hr]=Instalacija sustava
+Comment[hr]=Calamares — Instalacija sustava
+Name[hu]=Rendszer telepítése
+GenericName[hu]=Rendszertelepítő
+Comment[hu]=Calamares – Rendszertelepítő
+Name[id]=Instal Sistem
+GenericName[id]=Pemasang
+Comment[id]=Calamares — Pemasang Sistem
+Name[is]=Setja upp kerfið
+GenericName[is]=Kerfis uppsetning
+Comment[is]=Calamares — Kerfis uppsetning
+Name[cs_CZ]=Nainstalovat systém
+GenericName[cs_CZ]=Instalátor systému
+Comment[cs_CZ]=Calamares – instalátor operačních systémů
+Name[ja]=%OS_NAME%をインストール
+GenericName[ja]=%OS_NAME%インストーラー
+Comment[ja]=Calamares — %OS_NAME%インストーラー
+Name[ko]=시스템 설치
+GenericName[ko]=시스템 설치 관리자
+Comment[ko]=깔라마레스 — 시스템 설치 관리자
+Name[lt]=Įdiegti Sistemą
+GenericName[lt]=Sistemos diegimas į kompiuterį
+Comment[lt]=Calamares — Sistemos diegimo programa
+Name[it_IT]=Installa il sistema
+GenericName[it_IT]=Programma d'installazione del sistema
+Comment[it_IT]=Calamares — Programma d'installazione del sistema
+Name[mk]=Инсталирај го системот
+GenericName[mk]=Системен Инсталер
+Comment[mk]=Calamares - Системен Инсталер
+Name[ml]=സിസ്റ്റം ഇൻസ്റ്റാൾ ചെയ്യുക
+GenericName[ml]=സിസ്റ്റം ഇൻസ്റ്റാളർ
+Comment[ml]=കലാമാരേസ് - സിസ്റ്റം ഇൻസ്റ്റാളർ
+Name[nb]=Installer %OS_NAME%
+GenericName[nb]=%OS_NAME%installatør
+Comment[nb]=Calamares-%OS_NAME%installatør
+Name[nl]=Installeer systeem
+GenericName[nl]=Installatieprogramma
+Comment[nl]=Calamares — Installatieprogramma
+Name[pl]=Zainstaluj %OS_NAME%
+GenericName[pl]=Instalator %OS_NAME%
+Comment[pl]=Calamares — Instalator %OS_NAME%
+Name[pt_BR]=Sistema de Instalação
+GenericName[pt_BR]=Instalador de Sistema
+Comment[pt_BR]=Calamares — Instalador de Sistema
+Name[ro]=Instalează sistemul
+GenericName[ro]=Instalator de sistem
+Comment[ro]=Calamares — Instalator de sistem
+Name[ru]=Установить систему
+GenericName[ru]=Установщик системы
+Comment[ru]=Calamares - Установщик системы
+Name[sk]=Inštalovať systém
+GenericName[sk]=Inštalátor systému
+Comment[sk]=Calamares — Inštalátor systému
+Name[sl]=Namesti sistem
+Name[sq]=Instalo Sistemin
+GenericName[sq]=Instalues Sistemi
+Comment[sq]=Calamares — Instalues Sistemi
+Name[fi_FI]=Asenna Järjestelmä
+GenericName[fi_FI]=Järjestelmän Asennusohjelma
+Comment[fi_FI]=Calamares — Järjestelmän Asentaja
+Name[sr@latin]=Instaliraj sistem
+Name[sr]=Инсталирај систем
+GenericName[sr]=Инсталатер система
+Comment[sr]=Каламарес — инсталатер система
+Name[sv]=Installera %OS_NAME%
+GenericName[sv]=%OS_NAME%installerare
+Comment[sv]=Calamares — %OS_NAME%installerare
+Name[th]=ติดตั้งระบบ
+Name[uk]=Встановити Систему
+GenericName[uk]=Встановлювач системи
+Comment[uk]=Calamares - Встановлювач системи
+Name[zh_CN]=安装系统
+GenericName[zh_CN]=系统安装程序
+Comment[zh_CN]=Calamares — 系统安装程序
+Name[zh_TW]=安裝系統
+GenericName[zh_TW]=系統安裝程式
+Comment[zh_TW]=Calamares ── 系統安裝程式
+Name[ast]=Instalar el sistema
+GenericName[ast]=Instalador del sistema
+Comment[ast]=Calamares — Instalador del sistema
+Name[eo]=Instali Sistemo
+GenericName[eo]=Sistema Instalilo
+Comment[eo]=Calamares — Sistema Instalilo
+Name[ne_NP]=सिस्टम इन्स्टल गर्नुहोस्
+GenericName[ne_NP]=सिस्टम इन्स्टलर
+Comment[ne_NP]=Calamares - सिस्टम इन्स्टलर
+Name[es_MX]=Instalar el Sistema
+GenericName[es_MX]=Instalador del sistema
+Comment[es_MX]=Calamares - Instalador del sistema
+Name[pt_PT]=Instalar Sistema
+GenericName[pt_PT]=Instalador de Sistema
+Comment[pt_PT]=Calamares - Instalador de Sistema
+Name[tr_TR]=Sistemi Yükle
+GenericName[tr_TR]=Sistem Yükleyici
+Comment[tr_TR]=Calamares — Sistem Yükleyici
diff --git a/channels/serene/airootfs/etc/skel/Desktop/welcome-to-alter.desktop b/channels/serene/airootfs/etc/skel/Desktop/welcome-to-alter.desktop
deleted file mode 100755
index 1de9a7a..0000000
--- a/channels/serene/airootfs/etc/skel/Desktop/welcome-to-alter.desktop
+++ /dev/null
@@ -1,16 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Version=1.0
-Icon=/usr/share/icons/hicolor/scalable/apps/alter.svg
-Exec=/usr/bin/alterlinux-welcome-page
-Type=Application
-StartupNotify=false
-Terminal=false
-Hidden=false
-
-Name=Welcome to Alter Linux
-Comment=Displays the Alter Linux welcome page.
-
-Name[ja]=Alter Linuxへようこそ
-GenericName[ja]=Alter Linuxへようこそ
-Comment[ja]=Alter Linuxの利用に役立つページです。
diff --git a/channels/serene/airootfs/root/customize_airootfs_serene.sh b/channels/serene/airootfs/root/customize_airootfs_serene.sh
index bce2772..1cb2e1a 100755
--- a/channels/serene/airootfs/root/customize_airootfs_serene.sh
+++ b/channels/serene/airootfs/root/customize_airootfs_serene.sh
@@ -19,10 +19,16 @@ while getopts 'p:bt:k:rxu:o:i:s:da:g:z:l:' arg; do
         l) language="${OPTARG}" ;;
     esac
 done
-dnf install -y lightdm lightdm-gtk
 systemctl enable lightdm.service
 sed -i s/%USERNAME%/${username}/g /etc/lightdm/lightdm.conf
 dconf update
+# Set os name
+sed -i s/%OS_NAME%/"${os_name}"/g /etc/skel/Desktop/calamares.desktop
+
+# Create Calamares Entry
+cp -f /etc/skel/Desktop/calamares.desktop /usr/share/applications/calamares.desktop
+
 unlink /usr/share/backgrounds/images/default.png
 ln -s /usr/share/backgrounds/serene-wallpaper-1.png /usr/share/backgrounds/images/default.png
 
+echo -e "sed -i \"s/^autologin/#autologin/g\" /etc/lightdm/lightdm.conf" >> /usr/share/calamares/final-process
diff --git a/channels/serene/airootfs/usr/lib/os-release b/channels/serene/airootfs/usr/lib/os-release
deleted file mode 100644
index 1bbaf3e..0000000
--- a/channels/serene/airootfs/usr/lib/os-release
+++ /dev/null
@@ -1,16 +0,0 @@
-NAME=SereneLinux
-VERSION="32 (Thirty Two)"
-ID=fedora
-VERSION_ID=32
-PRETTY_NAME="SereneLinux"
-ANSI_COLOR="0;34"
-CPE_NAME="cpe:/o:fedoraproject:fedora:32"
-HOME_URL="https://fedoraproject.org/"
-SUPPORT_URL="https://fedoraproject.org/wiki/Communicating_and_getting_help"
-BUG_REPORT_URL="https://bugzilla.redhat.com/"
-REDHAT_BUGZILLA_PRODUCT="Fedora"
-REDHAT_BUGZILLA_PRODUCT_VERSION=32
-REDHAT_SUPPORT_PRODUCT="Fedora"
-REDHAT_SUPPORT_PRODUCT_VERSION=32
-PRIVACY_POLICY_URL="https://fedoraproject.org/wiki/Legal:PrivacyPolicy"
-LOGO=SereneLinux
\ No newline at end of file
-- 
2.11.0