OSDN > Trouver un logiciel > RebornOS > SCM > git > cnchi-gnome-osdn > Commit

Fork
cnchi-gnome-mac-osdn
cnchi-gnome-osdn
Faire un don

R/O
HTTP
SSH
HTTPS

cnchi-gnome-osdn: Commit

RebornOS cnchi Gnome based install code

Commit MetaInfo

Révision	bc61341e07fbbf56d07935f171b71cb7d163b634 (tree)
l'heure	2020-05-15 07:57:31
Auteur	Rafael Costa Rega <rcostarega@gmai...>
Commiter	Rafael Costa Rega

Message de Log

2020.05.14 update

Change Summary

modified: Cnchi/desktop_info.py (diff)
modified: Cnchi/features_info.py (diff)
modified: Cnchi/info.py (diff)
modified: Cnchi/packages.xml (diff)
modified: Cnchi/postinstall.sh (diff)
modified: packages.both (diff)
modified: scripts/flatpak.desktop (diff)

Modification

--- a/Cnchi/desktop_info.py

+++ b/Cnchi/desktop_info.py

		@@ -29,12 +29,13 @@
29	29
30	30	""" Desktop Environments information """
31	31
	32	+# Disabled desktops(in DESKTOPS_DEV = DESKTOPS : "enlightenment", "windows", "apricity"
32	33	# Enabled desktops
33	34
34	35	DESKTOPS = ["base", "cinnamon", "deepin",
35	36	"gnome", "kde", "mate", "openbox", "xfce"]
36	37
37		-DESKTOPS_DEV = DESKTOPS + ["budgie", "enlightenment", "i3", "lxqt", "pantheon", "windows", "apricity"]
	38	+DESKTOPS_DEV = DESKTOPS + ["budgie", "i3", "lxqt", "pantheon"]
38	39
39	40	DESKTOPS_A11Y = ["gnome", "mate", "apricity"]
40	41

		@@ -73,11 +74,11 @@ LIBS = {
73	74	'qt': ["kde", "lxqt"]
74	75	}
75	76
76		-ALL_FEATURES = ["a11y", "aur", "bluetooth", "broadcom", "maintenance", "cups", "chromium", "email", "dropbox", "firefox", "firefox-developer-edition", "google-chrome", "firewire", "opera", "hardinfo", "hunspell", "vivaldi", "games", "graphics", "gtk-play", "hardinfo", "qt-play", "movie", "mycroft", "graphic_drivers", "lamp", "lts", "freeoffice", "wps-office", "libreoffice", "redshift", "power", "sshd", "spotify", "visual", "vlc", "nautilus", "nemo", "qownnotes", "wallpapers", "wine"]
	77	+ALL_FEATURES = ["a11y", "aur", "bluetooth", "broadcom", "maintenance", "cups", "chromium", "email", "dropbox", "firefox", "firefox-developer-edition", "google-chrome", "firewire", "opera", "hardinfo", "hunspell", "vivaldi", "games", "graphics", "gtk-play", "hardinfo", "qt-play", "movie", "graphic_drivers", "lamp", "lts", "freeoffice", "wps-office", "libreoffice", "redshift", "power", "sshd", "spotify", "visual", "vlc", "nautilus", "nemo", "qownnotes", "wallpapers", "wine"]
77	78
78	79	# Not all desktops have all features
79	80	EXCLUDED_FEATURES = {
80		- 'base': ["bluetooth", "chromium", "maintenance", "dropbox", "email", "firefox", "firefox-developer-edition", "google-chrome", "firewire", "opera", "vivaldi", "games", "graphic_drivers", "graphics", "hardinfo", "hunspell", "freeoffice", "wps-office", "libreoffice", "visual", "vlc", "nautilus", "nemo", "qownnotes", "qt-play", "movie", "mycroft", "gtk-play", "qt-play", "power", "redshift", "spotify", "wallpapers", "wps-office", "libreoffice", "freeoffice"],
	81	+ 'base': ["bluetooth", "chromium", "maintenance", "dropbox", "email", "firefox", "firefox-developer-edition", "google-chrome", "firewire", "opera", "vivaldi", "games", "graphic_drivers", "graphics", "hardinfo", "hunspell", "freeoffice", "wps-office", "libreoffice", "visual", "vlc", "nautilus", "nemo", "qownnotes", "qt-play", "movie", "gtk-play", "qt-play", "power", "redshift", "spotify", "wallpapers", "wps-office", "libreoffice", "freeoffice"],
81	82	'apricity': ["lamp", "visual", "nautilus", "qt-play"],
82	83	'cinnamon': ["lamp", "visual", "nemo", "qt-play"],
83	84	'deepin': ["lamp", "visual", "qt-play"],

--- a/Cnchi/features_info.py

+++ b/Cnchi/features_info.py

		@@ -37,7 +37,7 @@ ICON_NAMES = {
37	37	'a11y': 'preferences-desktop-accessibility',
38	38	'aur': 'system-software-install',
39	39	'bluetooth': 'bluetooth',
40		- 'broadcom':'cs-drivers',
	40	+ 'broadcom': 'cs-drivers',
41	41	'cups': 'printer',
42	42	'chromium': 'chromium',
43	43	'dropbox': 'dropbox',

		@@ -56,7 +56,6 @@ ICON_NAMES = {
56	56	'qt-play': 'applications-games',
57	57	'maintenance': 'baobab',
58	58	'movie': 'artemanufrij.screencast',
59		- 'mycroft': 'deepin-voice-recorder',
60	59	'graphic_drivers': 'gnome-system',
61	60	'lamp': 'applications-internet',
62	61	'lts': 'applications-accessories',

		@@ -83,7 +82,7 @@ ICON_NAMES = {
83	82	ADVANCED = [ 'lamp', 'sshd', 'visual', 'firewire', 'broadcom', 'nautilus', 'nemo', 'email', 'wallpapers', 'hunspell' ]
84	83
85	84	# These features are considered 'basic', and will be shown by default
86		-BASIC = ['opera', 'wine', 'wallpapers', 'vlc', 'vivaldi', 'visual', 'spotify', 'redshift', 'power', 'libreoffice', 'wps-office', 'freeoffice', 'qownnotes', 'lts', 'graphic_drivers', 'mycroft', 'movie', 'maintenance', 'qt-play', 'hardinfo', 'gtk-play', 'graphics', 'games', 'fonts', 'firefox', 'firefox-developer-edition', 'google-chrome', 'email', 'dropbox', 'chromium', 'cups', 'bluetooth', 'aur', 'a11y']
	85	+BASIC = ['opera', 'wine', 'wallpapers', 'vlc', 'vivaldi', 'visual', 'spotify', 'redshift', 'power', 'libreoffice', 'wps-office', 'freeoffice', 'qownnotes', 'lts', 'graphic_drivers', 'movie', 'maintenance', 'qt-play', 'hardinfo', 'gtk-play', 'graphics', 'games', 'fonts', 'firefox', 'firefox-developer-edition', 'google-chrome', 'email', 'dropbox', 'chromium', 'cups', 'bluetooth', 'aur', 'a11y']
87	86
88	87	# See http://docs.python.org/2/library/gettext.html "22.1.3.4. Deferred translations"
89	88	def _(message):

		@@ -113,7 +112,6 @@ TITLES = {
113	112	'hardinfo': _("Hardware Analysis"),
114	113	'maintenance': _("Applications to Perform System Maintenance"),
115	114	'movie': _("Common Video Editing Programs for Linux"),
116		- 'mycroft': _("Mycroft"),
117	115	'graphics': _("Common Photo editing Programs for Linux"),
118	116	'hunspell': _("Spell Check"),
119	117	'lamp': _("Apache (or Nginx) + Mariadb + PHP"),

		@@ -158,7 +156,6 @@ DESCRIPTIONS = {
158	156	'qt-play': _("Popular games for Linux, all created for use on your Desktop Environment"),
159	157	'maintenance': _("Common Applications to Perform System Maintenance On Linux"),
160	158	'movie': _("Common video editing programs for Linux"),
161		- 'mycroft': _("An Open Source alternative to AIs such as Amazon's Alexa and Apple's Siri"),
162	159	'graphics': _("Common Photo editing Programs for Linux"),
163	160	'lamp': _("Apache (or Nginx) + Mariadb + PHP installation and setup."),
164	161	'cups': _("Installation of printer drivers and management tools."),

		@@ -276,9 +273,6 @@ TOOLTIPS = {
276	273	"programs in a file so that you can reinstall them later."),
277	274	'movie': _("Common video editing programs for Linux, such as Open Shot, KdenLive,\n"
278	275	"Pitivi, and Avidemux"),
279		- 'mycroft': _("Open Source alternative to AIs such as Amazon's Alexa and Apple's Siri. Just like other AIs,\n"
280		- "Mycroft is voice activated and can perform numerous tasks. However, unlike other IAs,\n"
281		- "Mycroft does NOT collect any information on its users - keeping your privacy intact"),
282	276	'graphics': _("Common Photo editing Programs for Linux, such as Gimp, GtThumb,\n"
283	277	"Rapid Photo Downloader, Rawtherapee, and DarkTable"),
284	278	'lamp': _("This option installs a web server (you can choose\n"

--- a/Cnchi/info.py

+++ b/Cnchi/info.py

		@@ -29,7 +29,7 @@
29	29
30	30	""" Set some Cnchi global constants """
31	31
32		-CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.09"
	32	+CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.14"
33	33	CNCHI_WEBSITE = "https://rebornos.org"
34	34	CNCHI_RELEASE_STAGE = "production"
35	35

--- a/Cnchi/packages.xml

+++ b/Cnchi/packages.xml

		@@ -429,9 +429,6 @@
429	429	<pkgname>pitivi</pkgname>
430	430	<pkgname>avidemux-cli</pkgname>
431	431	</feature>
432		- <feature name="mycroft">
433		- <pkgname>mycroft-reborn</pkgname>
434		- </feature>
435	432	<feature name="plymouth">
436	433	<pkgname>plymouth</pkgname>
437	434	<pkgname>arch-plymouthize</pkgname>

--- a/Cnchi/postinstall.sh

+++ b/Cnchi/postinstall.sh

		@@ -200,14 +200,14 @@ mate_settings() {
200	200
201	201	cp ${APP_LIST} "${CN_DESTDIR}/usr/lib/linuxmint/mintMenu/applications.list"
202	202
203		- # Work-around for bug in mate-panel
204		- CN_POST_INSTALL_DIR=/usr/share/cnchi/scripts/postinstall
205		- CN_HOTFIX_SCRIPT="${CN_POST_INSTALL_DIR}/first-boot-hotfix.sh"
206		- CN_HOTFIX_DESKTOP="${CN_POST_INSTALL_DIR}/first-boot-hotfix.desktop"
207		- cp "${CN_HOTFIX_SCRIPT}" "${CN_DESTDIR}/usr/bin"
208		- mkdir -p "${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart"
209		- cp "${CN_HOTFIX_DESKTOP}" "${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart"
210		- chmod +x "${CN_DESTDIR}/usr/bin/first-boot-hotfix.sh"
	203	+ # Work-around for bug in mate-panel - Fixed now in line 501 (Rafael from RebornOS)
	204	+ #CN_POST_INSTALL_DIR=/usr/share/cnchi/scripts/postinstall
	205	+ #CN_HOTFIX_SCRIPT="${CN_POST_INSTALL_DIR}/first-boot-hotfix.sh"
	206	+ #CN_HOTFIX_DESKTOP="${CN_POST_INSTALL_DIR}/first-boot-hotfix.desktop"
	207	+ #cp "${CN_HOTFIX_SCRIPT}" "${CN_DESTDIR}/usr/bin"
	208	+ #mkdir -p "${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart"
	209	+ #cp "${CN_HOTFIX_DESKTOP}" "${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart"
	210	+ #chmod +x "${CN_DESTDIR}/usr/bin/first-boot-hotfix.sh"
211	211	}
212	212
213	213	nox_settings() {

		@@ -223,9 +223,9 @@ lxqt_settings() {
223	223	set_dmrc razor
224	224	}
225	225
226		-enlightenment_settings() {
227		- set_gsettings
228		- set_xscreensaver
	226	+#enlightenment_settings() {
	227	+# set_gsettings
	228	+# set_xscreensaver
229	229
230	230	# http://git.enlightenment.org/core/enlightenment.git/plain/data/tools/enlightenment_remote
231	231

		@@ -234,23 +234,23 @@ enlightenment_settings() {
234	234	#chroot ${CN_DESTDIR} /usr/bin/antergos-desktop enlightenment ${CN_USER_NAME}
235	235
236	236	# Set Keyboard layout
237		- E_CFG="/home/${CN_USER_NAME}/.e/e/config/standard/e.cfg"
238		- E_SRC="/home/${CN_USER_NAME}/.e/e/config/standard/e.src"
	237	+# E_CFG="/home/${CN_USER_NAME}/.e/e/config/standard/e.cfg"
	238	+# E_SRC="/home/${CN_USER_NAME}/.e/e/config/standard/e.src"
239	239
240		- ${CN_DESTDIR}/usr/bin/eet -d ${E_CFG} config ${E_SRC}
241		- sed -i 's/"us"/"${CN_KEYBOARD_LAYOUT}"/' ${E_SRC}
242		- if [[ "${CN_KEYBOARD_VARIANT}" != '' ]]; then
243		- sed -i 's/"basic"/"${CN_KEYBOARD_VARIANT}"/' ${E_SRC}
244		- fi
245		- ${CN_DESTDIR}/usr/bin/eet -e ${E_CFG} config ${E_SRC} 1
	240	+# ${CN_DESTDIR}/usr/bin/eet -d ${E_CFG} config ${E_SRC}
	241	+# sed -i 's/"us"/"${CN_KEYBOARD_LAYOUT}"/' ${E_SRC}
	242	+# if [[ "${CN_KEYBOARD_VARIANT}" != '' ]]; then
	243	+# sed -i 's/"basic"/"${CN_KEYBOARD_VARIANT}"/' ${E_SRC}
	244	+# fi
	245	+# ${CN_DESTDIR}/usr/bin/eet -e ${E_CFG} config ${E_SRC} 1
246	246
247		- set_dmrc enlightenment
	247	+# set_dmrc enlightenment
248	248
249		- echo "QT_STYLE_OVERRIDE=gtk" >> ${CN_DESTDIR}/etc/environment
	249	+# echo "QT_STYLE_OVERRIDE=gtk" >> ${CN_DESTDIR}/etc/environment
250	250
251	251	# Add lxpolkit to autostart apps
252		- cp /etc/xdg/autostart/lxpolkit.desktop ${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart
253		-}
	252	+# cp /etc/xdg/autostart/lxpolkit.desktop ${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart
	253	+#}
254	254
255	255	budgie_settings() {
256	256	set_gsettings

		@@ -349,10 +349,6 @@ postinstall() {
349	349	if [[ deepin = "${CN_DESKTOP}" ]]; then
350	350	rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf
351	351	cp /etc/lightdm/lightdm.conf ${CN_DESTDIR}/etc/lightdm/
352		- # chroot ${CN_DESTDIR} sudo pacman -Rdd deepin-cosmic-reborn --noconfirm
353		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
354		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
355		- # chroot ${CN_DESTDIR} sudo pacman -Rdd qt5ct --noconfirm --> Not installed now
356	352	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
357	353	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
358	354	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -368,9 +364,6 @@ postinstall() {
368	364
369	365	if [[ gnome = "${CN_DESKTOP}" ]]; then
370	366	chroot ${CN_DESTDIR} systemctl -fq enable gdm
371		- # chroot ${CN_DESTDIR} sudo pacman -Rdd gnome-cosmic-reborn --noconfirm
372		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
373		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
374	367	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
375	368	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
376	369	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -386,30 +379,24 @@ postinstall() {
386	379	chroot ${CN_DESTDIR} /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
387	380	fi
388	381
389		- if [[ apricity = "${CN_DESKTOP}" ]]; then
390		- chroot ${CN_DESTDIR} systemctl -fq enable gdm
391		- # chroot ${CN_DESTDIR} sudo pacman -Rdd gnome-cosmic-reborn --noconfirm
392		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
393		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
394		- cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
395		- cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
396		- cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
397		- cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
398		- cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
399		- cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
400		- echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment
401		- echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
402		- echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment
403		- chroot ${CN_DESTDIR} systemctl enable earlyoom
404		- chroot ${CN_DESTDIR} systemctl enable ufw
405		- fi
	382	+# if [[ apricity = "${CN_DESKTOP}" ]]; then
	383	+# chroot ${CN_DESTDIR} systemctl -fq enable gdm
	384	+# cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
	385	+# cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
	386	+# cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
	387	+# cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
	388	+# cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
	389	+# cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
	390	+# echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment
	391	+# echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
	392	+# echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment
	393	+# chroot ${CN_DESTDIR} systemctl enable earlyoom
	394	+# chroot ${CN_DESTDIR} systemctl enable ufw
	395	+# fi
406	396
407	397	if [[ kde = "${CN_DESKTOP}" ]]; then
408	398	chroot ${CN_DESTDIR} systemctl -fq enable sddm
409	399	cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
410		- # chroot ${CN_DESTDIR} sudo pacman -Rdd kde-cosmic-reborn --noconfirm
411		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
412		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
413	400	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
414	401	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
415	402	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -424,9 +411,6 @@ postinstall() {
424	411	chroot ${CN_DESTDIR} systemctl -fq enable lightdm
425	412	sed -i 's/^webkit_theme\s=\s$.*$/webkit_theme = lightdm-webkit-theme-aether #\1/g' ${CN_DESTDIR}/etc/lightdm/lightdm-webkit2-greeter.conf
426	413	sed -i 's/^$#?greeter$-session\s=\s$.*$/greeter-session = lightdm-webkit2-greeter #\1/ #\2g' ${CN_DESTDIR}/etc/lightdm/lightdm.conf
427		- # chroot ${CN_DESTDIR} sudo pacman -Rdd budgie-cosmic-reborn --noconfirm
428		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
429		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
430	414	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
431	415	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
432	416	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -443,9 +427,6 @@ postinstall() {
443	427	if [[ i3 = "${CN_DESKTOP}" ]]; then
444	428	chroot ${CN_DESTDIR} systemctl -fq enable sddm
445	429	cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
446		- # chroot ${CN_DESTDIR} sudo pacman -Rdd i3-cosmic-reborn --noconfirm
447		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
448		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
449	430	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
450	431	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
451	432	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -459,31 +440,25 @@ postinstall() {
459	440	chroot ${CN_DESTDIR} systemctl enable ufw
460	441	fi
461	442
462		- if [ -f "${CN_DESTDIR}/usr/bin/enlightenment" ]; then
463		- chroot ${CN_DESTDIR} systemctl -fq enable sddm
464		- cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
465		- # chroot ${CN_DESTDIR} sudo pacman -Rdd enlightenment-cosmic-reborn --noconfirm
466		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
467		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
468		- cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
469		- cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
470		- cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
471		- cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
472		- cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
473		- cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
474		- echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment
475		- echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
476		- echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment
477		- chroot ${CN_DESTDIR} systemctl enable earlyoom
478		- chroot ${CN_DESTDIR} systemctl enable ufw
479		- fi
	443	+ # if [ -f "${CN_DESTDIR}/usr/bin/enlightenment" ]; then
	444	+ # chroot ${CN_DESTDIR} systemctl -fq enable sddm
	445	+ # cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
	446	+ # cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
	447	+ # cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
	448	+ # cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
	449	+ # cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
	450	+ # cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
	451	+ # cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
	452	+ # echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment
	453	+ # echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
	454	+ # echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment
	455	+ # chroot ${CN_DESTDIR} systemctl enable earlyoom
	456	+ # chroot ${CN_DESTDIR} systemctl enable ufw
	457	+ # fi
480	458
481	459	if [[ lxqt = "${CN_DESKTOP}" ]]; then
482	460	chroot ${CN_DESTDIR} systemctl -fq enable sddm
483	461	cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
484		- # chroot ${CN_DESTDIR} sudo pacman -Rdd lxqt-cosmic-reborn --noconfirm
485		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
486		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
487	462	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
488	463	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
489	464	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -499,9 +474,6 @@ postinstall() {
499	474	cp /usr/share/cnchi/lightdm-webkit2-greeter.conf ${CN_DESTDIR}/etc/lightdm/
500	475	chmod go=rx ${CN_DESTDIR}/var/lib/lightdm-data
501	476	chroot ${CN_DESTDIR} systemctl -fq enable lxdm
502		- # chroot ${CN_DESTDIR} sudo pacman -Rdd openbox-cosmic-reborn --noconfirm
503		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
504		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
505	477	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
506	478	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
507	479	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -520,9 +492,6 @@ postinstall() {
520	492	if [[ mate = "${CN_DESKTOP}" ]]; then
521	493	chroot ${CN_DESTDIR} systemctl -fq enable sddm
522	494	cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
523		- # chroot ${CN_DESTDIR} sudo pacman -Rdd mate-cosmic-reborn --noconfirm
524		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
525		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
526	495	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
527	496	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
528	497	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -542,9 +511,6 @@ postinstall() {
542	511	if [[ xfce = "${CN_DESKTOP}" ]]; then
543	512	chroot ${CN_DESTDIR} systemctl -fq enable sddm
544	513	cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
545		- # chroot ${CN_DESTDIR} sudo pacman -Rdd xfce-cosmic-reborn --noconfirm
546		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
547		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
548	514	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
549	515	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
550	516	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -561,9 +527,6 @@ fi
561	527	if [[ cinnamon = "${CN_DESKTOP}" ]]; then
562	528	chroot ${CN_DESTDIR} systemctl -fq enable sddm
563	529	cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
564		- # chroot ${CN_DESTDIR} sudo pacman -Rdd cinnamon-cosmic-reborn --noconfirm
565		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
566		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
567	530	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
568	531	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
569	532	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -582,9 +545,6 @@ fi
582	545	if [[ pantheon = "${CN_DESKTOP}" ]]; then
583	546	chroot ${CN_DESTDIR} systemctl -fq enable sddm
584	547	cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
585		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
586		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
587		- # chroot ${CN_DESTDIR} sudo pacman -Rdd elementary-cosmic-reborn --noconfirm
588	548	cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
589	549	cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
590	550	cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/

		@@ -598,24 +558,21 @@ if [[ pantheon = "${CN_DESKTOP}" ]]; then
598	558	chroot ${CN_DESTDIR} systemctl enable ufw
599	559	fi
600	560
601		-if [[ windows = "${CN_DESKTOP}" ]]; then
602		- chroot ${CN_DESTDIR} systemctl -fq enable sddm
603		- cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
604		- # chroot ${CN_DESTDIR} sudo pacman -Rdd cinnamon-cosmic-reborn --noconfirm
605		- # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm
606		- # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm
607		- cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
608		- cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
609		- cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
610		- cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
611		- cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
612		- cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
613		- echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment
614		- echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
615		- echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment
616		- chroot ${CN_DESTDIR} systemctl enable earlyoom
617		- chroot ${CN_DESTDIR} systemctl enable ufw
618		-fi
	561	+#if [[ windows = "${CN_DESKTOP}" ]]; then
	562	+# chroot ${CN_DESTDIR} systemctl -fq enable sddm
	563	+# cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/
	564	+# cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
	565	+# cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
	566	+# cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
	567	+# cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/
	568	+# cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/
	569	+# cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
	570	+# echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment
	571	+# echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment
	572	+# echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment
	573	+# chroot ${CN_DESTDIR} systemctl enable earlyoom
	574	+# chroot ${CN_DESTDIR} systemctl enable ufw
	575	+#fi
619	576
620	577	# Copy pacman.conf file over
621	578	rm ${CN_DESTDIR}/etc/pacman.conf

--- a/packages.both

+++ b/packages.both

		@@ -115,7 +115,8 @@ xdg-desktop-portal-gtk
115	115	xscreensaver
116	116
117	117
118		-reborn-updates
	118	+# reborn-updates --> Changed now with rebornos-fire
	119	+rebornos-fire
119	120	bubblewrap
120	121
121	122

--- a/scripts/flatpak.desktop

+++ b/scripts/flatpak.desktop

		@@ -1,6 +1,6 @@
1	1	[Desktop Entry]
2	2	Comment=Flatpak For Reborn
3		-Exec=gksu flatpak.sh
	3	+Exec=flatpak.sh
4	4	GenericName=Flatpak Installer
5	5	Icon=/usr/share/icons/default/reborn-updates.svg
6	6	Name=Flatpak Installer

Afficher sur ancien navigateur de dépôt.