Skip to content

Commit fa75b06

Browse files
committed
Latest final-process (from share module)
1 parent 91824c6 commit fa75b06

File tree

2 files changed

+103
-56
lines changed

2 files changed

+103
-56
lines changed

data/calamares.desktop

Lines changed: 62 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
[Desktop Entry]
22
Type=Application
33
Version=1.0
4-
Name=Install Alter Linux
5-
GenericName=Alter Linux Installer
6-
Keywords=calamares;alter;linux;installer;
4+
Name=Install System
5+
GenericName=System Installer
6+
Keywords=calamares;system;installer;
77
TryExec=calamares
8-
Exec=pkexec /usr/bin/calamares
9-
Comment=Alter Linux Installer - by Calamares
8+
Exec=sh -c "sudo -E calamares"
9+
Comment=Calamares — System Installer
1010
Icon=calamares
1111
Terminal=false
1212
StartupNotify=true
@@ -21,6 +21,10 @@ Name[as]=চিছটেম ইনস্তল কৰক
2121
Icon[as]=কেলামাৰেচ
2222
GenericName[as]=চিছটেম ইনস্তলাৰ
2323
Comment[as]=কেলামাৰেচ — চিছটেম​ ইনস্তলাৰ
24+
Name[az]=Sistemi Quraşdırmaq
25+
Icon[az]=calamares
26+
GenericName[az]=Sistem Quraşdırıcısı
27+
Comment[az]=Calamares Sistem Quraşdırıcısı
2428
Name[be]=Усталяваць сістэму
2529
Icon[be]=calamares
2630
GenericName[be]=Усталёўшчык сістэмы
@@ -29,26 +33,30 @@ Name[bg]=Инсталирай системата
2933
Icon[bg]=calamares
3034
GenericName[bg]=Системен Инсталатор
3135
Comment[bg]=Calamares — Системен Инсталатор
36+
Name[bn]=সিস্টেম ইনস্টল করুন
37+
Icon[bn]=ক্যালামারেস
38+
GenericName[bn]=সিস্টেম ইনস্টলার
39+
Comment[bn]=ক্যালামারেস - সিস্টেম ইনস্টলার
3240
Name[ca]=Instal·la el sistema
3341
Icon[ca]=calamares
3442
GenericName[ca]=Instal·lador de sistema
3543
Comment[ca]=Calamares — Instal·lador de sistema
36-
Name[da]=Installér AlterLinux
44+
Name[da]=Installér system
3745
Icon[da]=calamares
38-
GenericName[da]=AlterLinuxinstallationsprogram
39-
Comment[da]=Calamares — AlterLinuxinstallationsprogram
40-
Name[de]=AlterLinux installieren
46+
GenericName[da]=Systeminstallationsprogram
47+
Comment[da]=Calamares — Systeminstallationsprogram
48+
Name[de]=System installieren
4149
Icon[de]=calamares
42-
GenericName[de]=Installation des BetriebsAlterLinuxs
43-
Comment[de]=Calamares - Installation des BetriebsAlterLinuxs
50+
GenericName[de]=Installation des Betriebssystems
51+
Comment[de]=Calamares - Installation des Betriebssystems
4452
Name[el]=Εγκατάσταση συστήματος
4553
Icon[el]=calamares
4654
GenericName[el]=Εγκατάσταση συστήματος
4755
Comment[el]=Calamares — Εγκατάσταση συστήματος
48-
Name[en_GB]=Install AlterLinux
56+
Name[en_GB]=Install System
4957
Icon[en_GB]=calamares
50-
GenericName[en_GB]=AlterLinux Installer
51-
Comment[en_GB]=Calamares — AlterLinux Installer
58+
GenericName[en_GB]=System Installer
59+
Comment[en_GB]=Calamares — System Installer
5260
Name[es]=Instalar Sistema
5361
Icon[es]=calamares
5462
GenericName[es]=Instalador del Sistema
@@ -61,11 +69,19 @@ Name[eu]=Sistema instalatu
6169
Icon[eu]=calamares
6270
GenericName[eu]=Sistema instalatzailea
6371
Comment[eu]=Calamares - sistema instalatzailea
72+
Name[fa]=نصب سامانه
73+
Icon[fa]=کالامارس
74+
GenericName[fa]=نصب‌کنندهٔ سامانه
75+
Comment[fa]=کالامارس — نصب‌کنندهٔ سامانه
6476
Name[es_PR]=Instalar el sistema
6577
Name[fr]=Installer le système
6678
Icon[fr]=calamares
6779
GenericName[fr]=Installateur système
6880
Comment[fr]=Calamares - Installateur système
81+
Name[fur]=Instale il sisteme
82+
Icon[fur]=calamares
83+
GenericName[fur]=Program di instalazion dal sisteme
84+
Comment[fur]=Calamares — Program di instalazion dal sisteme
6985
Name[gl]=Instalación do Sistema
7086
Icon[gl]=calamares
7187
GenericName[gl]=Instalador de sistemas
@@ -82,6 +98,10 @@ Name[hr]=Instaliraj sustav
8298
Icon[hr]=calamares
8399
GenericName[hr]=Instalacija sustava
84100
Comment[hr]=Calamares — Instalacija sustava
101+
Name[ie]=Installar li sistema
102+
Icon[ie]=calamares
103+
GenericName[ie]=Installator del sistema
104+
Comment[ie]=Calamares — Installator del sistema
85105
Name[hu]=Rendszer telepítése
86106
Icon[hu]=calamares
87107
GenericName[hu]=Rendszertelepítő
@@ -98,10 +118,10 @@ Name[cs_CZ]=Nainstalovat systém
98118
Icon[cs_CZ]=calamares
99119
GenericName[cs_CZ]=Instalátor systému
100120
Comment[cs_CZ]=Calamares – instalátor operačních systémů
101-
Name[ja]=AlterLinuxをインストール
121+
Name[ja]=システムをインストール
102122
Icon[ja]=calamares
103-
GenericName[ja]=AlterLinuxインストーラー
104-
Comment[ja]=Calamares — AlterLinuxインストーラー
123+
GenericName[ja]=システムインストーラー
124+
Comment[ja]=Calamares — システムインストーラー
105125
Name[ko]=시스템 설치
106126
Icon[ko]=깔라마레스
107127
GenericName[ko]=시스템 설치 관리자
@@ -122,18 +142,22 @@ Name[ml]=സിസ്റ്റം ഇൻസ്റ്റാൾ ചെയ്യു
122142
Icon[ml]=കലാമാരേസ്
123143
GenericName[ml]=സിസ്റ്റം ഇൻസ്റ്റാളർ
124144
Comment[ml]=കലാമാരേസ് - സിസ്റ്റം ഇൻസ്റ്റാളർ
125-
Name[nb]=Installer AlterLinux
145+
Name[nb]=Installer System
126146
Icon[nb]=calamares
127-
GenericName[nb]=AlterLinuxinstallatør
128-
Comment[nb]=Calamares-AlterLinuxinstallatør
147+
GenericName[nb]=Systeminstallatør
148+
Comment[nb]=Calamares-systeminstallatør
129149
Name[nl]=Installeer systeem
130150
Icon[nl]=calamares
131151
GenericName[nl]=Installatieprogramma
132152
Comment[nl]=Calamares — Installatieprogramma
133-
Name[pl]=Zainstaluj AlterLinux
153+
Name[az_AZ]=Sistemi quraşdırmaq
154+
Icon[az_AZ]=calamares
155+
GenericName[az_AZ]=Sistem quraşdırcısı
156+
Comment[az_AZ]=Calamares — Sistem Quraşdırıcısı
157+
Name[pl]=Zainstaluj system
134158
Icon[pl]=calamares
135-
GenericName[pl]=Instalator AlterLinux
136-
Comment[pl]=Calamares — Instalator AlterLinux
159+
GenericName[pl]=Instalator systemu
160+
Comment[pl]=Calamares — Instalator systemu
137161
Name[pt_BR]=Sistema de Instalação
138162
Icon[pt_BR]=calamares
139163
GenericName[pt_BR]=Instalador de Sistema
@@ -155,24 +179,32 @@ Name[sq]=Instalo Sistemin
155179
Icon[sq]=calamares
156180
GenericName[sq]=Instalues Sistemi
157181
Comment[sq]=Calamares — Instalues Sistemi
158-
Name[fi_FI]=Asenna Järjestelmä
182+
Name[fi_FI]=Asenna järjestelmä
159183
Icon[fi_FI]=calamares
160-
GenericName[fi_FI]=Järjestelmän Asennusohjelma
161-
Comment[fi_FI]=Calamares — Järjestelmän Asentaja
184+
GenericName[fi_FI]=Järjestelmän asennusohjelma
185+
Comment[fi_FI]=Calamares — Järjestelmän asentaja
162186
Name[sr@latin]=Instaliraj sistem
163187
Name[sr]=Инсталирај систем
164188
Icon[sr]=calamares
165189
GenericName[sr]=Инсталатер система
166190
Comment[sr]=Каламарес — инсталатер система
167-
Name[sv]=Installera AlterLinux
191+
Name[sv]=Installera system
168192
Icon[sv]=calamares
169-
GenericName[sv]=AlterLinuxinstallerare
170-
Comment[sv]=Calamares — AlterLinuxinstallerare
193+
GenericName[sv]=Systeminstallerare
194+
Comment[sv]=Calamares — Systeminstallerare
195+
Name[tg]=Насбкунии низом
196+
Icon[tg]=calamares
197+
GenericName[tg]=Насбкунандаи низомӣ
198+
Comment[tg]=Calamares — Насбкунандаи низомӣ
171199
Name[th]=ติดตั้งระบบ
172200
Name[uk]=Встановити Систему
173201
Icon[uk]=calamares
174202
GenericName[uk]=Встановлювач системи
175203
Comment[uk]=Calamares - Встановлювач системи
204+
Name[vi]=Cài đặt hệ thống
205+
Icon[vi]=calamares
206+
GenericName[vi]=Bộ cài đặt hệ thống
207+
Comment[vi]=Calamares — Bộ cài đặt hệ thống
176208
Name[zh_CN]=安装系统
177209
Icon[zh_CN]=calamares
178210
GenericName[zh_CN]=系统安装程序
@@ -204,4 +236,4 @@ Comment[pt_PT]=Calamares - Instalador de Sistema
204236
Name[tr_TR]=Sistemi Yükle
205237
Icon[tr_TR]=calamares
206238
GenericName[tr_TR]=Sistem Yükleyici
207-
Comment[tr_TR]=Calamares — Sistem Yükleyici
239+
Comment[tr_TR]=Calamares — Sistem Yükleyici

data/final-process

Lines changed: 41 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,12 @@
11
#!/usr/bin/env bash
22

3+
set -e
4+
5+
script_path="$( cd -P "$( dirname "$(readlink -f "${0}")" )" && pwd )"
6+
script_name="$(basename "$(realpath "${0}")")"
7+
38
function remove () {
4-
local list
5-
local file
6-
list=($(echo "$@"))
7-
for file in "${list[@]}"; do
8-
if [[ -f ${file} ]]; then
9-
rm -f "${file}"
10-
elif [[ -d ${file} ]]; then
11-
rm -rf "${file}"
12-
fi
13-
done
9+
rm -rf "${@}"
1410
}
1511

1612
while getopts 'u:' arg; do
@@ -19,35 +15,54 @@ while getopts 'u:' arg; do
1915
esac
2016
done
2117

18+
function remove_user_file(){
19+
remove "/etc/skel/${@}"
20+
remove "/home/${user}/${@}"
21+
}
22+
23+
2224
remove /etc/skel/Desktop
23-
remove /etc/skel/.config/gtk-3.0/bookmarks
24-
remove /home/${user}/Desktop/calamares.desktop
25-
remove /root/Desktop/calamares.desktop
26-
remove /home/${user}/.config/gtk-3.0/bookmarks
2725
remove /usr/share/calamares/
2826

27+
remove_user_file "Desktop/calamares.desktop"
28+
remove_user_file ".config/gtk-3.0/bookmarks"
29+
30+
2931
remove /etc/polkit-1/rules.d/01-nopasswork.rules
3032

3133
# Delete unnecessary files of archiso.
32-
# See the following site for details.
33-
# https://wiki.archlinux.jp/index.php/Archiso#Chroot_.E3.81.A8.E3.83.99.E3.83.BC.E3.82.B9.E3.82.B7.E3.82.B9.E3.83.86.E3.83.A0.E3.81.AE.E8.A8.AD.E5.AE.9A
34-
35-
remove /etc/systemd/system/[email protected]/autologin.conf
3634
remove /root/.automated_script.sh
3735
remove /etc/mkinitcpio-archiso.conf
3836
remove /etc/initcpio
3937

38+
# Delete systemd files
4039
remove /etc/systemd/journald.conf.d/volatile-storage.conf
41-
remove /airootfs.any/etc/systemd/logind.conf.d/do-not-suspend.conf
42-
43-
remove /etc/udev/rules.d/81-dhcpcd.rules
4440
remove /etc/systemd/system/[email protected]
41+
remove /etc/systemd/system/alteriso-reflector.service
4542

46-
if [[ -f /etc/systemd/journald.conf ]]; then
47-
sed -i 's/Storage=volatile/#Storage=auto/' /etc/systemd/journald.conf
48-
fi
49-
50-
# Disabled auto login
43+
# Disabled auto login for LightDM
5144
if [[ -f "/etc/lightdm/lightdm.conf" ]]; then
5245
sed -i "s/^autologin/#autologin/g" "/etc/lightdm/lightdm.conf"
5346
fi
47+
remove "/etc/lightdm/lightdm.conf.d/02-autologin-"*
48+
49+
# Disabled auto login for GDM
50+
if [[ -f "/etc/gdm/custom.conf" ]]; then
51+
sed -i "s/Automatic*/#Automatic/g" "/etc/gdm/custom.conf"
52+
fi
53+
54+
# Remove dconf for live environment
55+
remove "/etc/dconf/db/local.d/02-disable-lock"
56+
remove "/etc/dconf/db/local.d/02-live-"*
57+
58+
# Update system datebase
59+
if type dconf > /dev/null 2>&1 ; then
60+
dconf update
61+
fi
62+
63+
# 追加のスクリプトを実行
64+
if [[ -d "${script_path}/${script_name}.d/" ]]; then
65+
for extra_script in "${script_path}/${script_name}.d/"*; do
66+
bash -c "${extra_script} ${user}"
67+
done
68+
fi

0 commit comments

Comments
 (0)