• R/O
  • HTTP
  • SSH
  • HTTPS

cnchi-gnome-osdn: Commit

RebornOS cnchi Gnome based install code


Commit MetaInfo

Revisionbc61341e07fbbf56d07935f171b71cb7d163b634 (tree)
Time2020-05-15 07:57:31
AuthorRafael Costa Rega <rcostarega@gmai...>
CommiterRafael Costa Rega

Log Message

2020.05.14 update

Change Summary

Incremental Difference

--- a/Cnchi/desktop_info.py
+++ b/Cnchi/desktop_info.py
@@ -29,12 +29,13 @@
2929
3030 """ Desktop Environments information """
3131
32+# Disabled desktops(in DESKTOPS_DEV = DESKTOPS : "enlightenment", "windows", "apricity"
3233 # Enabled desktops
3334
3435 DESKTOPS = ["base", "cinnamon", "deepin",
3536 "gnome", "kde", "mate", "openbox", "xfce"]
3637
37-DESKTOPS_DEV = DESKTOPS + ["budgie", "enlightenment", "i3", "lxqt", "pantheon", "windows", "apricity"]
38+DESKTOPS_DEV = DESKTOPS + ["budgie", "i3", "lxqt", "pantheon"]
3839
3940 DESKTOPS_A11Y = ["gnome", "mate", "apricity"]
4041
@@ -73,11 +74,11 @@ LIBS = {
7374 'qt': ["kde", "lxqt"]
7475 }
7576
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"]
7778
7879 # Not all desktops have all features
7980 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"],
8182 'apricity': ["lamp", "visual", "nautilus", "qt-play"],
8283 'cinnamon': ["lamp", "visual", "nemo", "qt-play"],
8384 'deepin': ["lamp", "visual", "qt-play"],
--- a/Cnchi/features_info.py
+++ b/Cnchi/features_info.py
@@ -37,7 +37,7 @@ ICON_NAMES = {
3737 'a11y': 'preferences-desktop-accessibility',
3838 'aur': 'system-software-install',
3939 'bluetooth': 'bluetooth',
40- 'broadcom':'cs-drivers',
40+ 'broadcom': 'cs-drivers',
4141 'cups': 'printer',
4242 'chromium': 'chromium',
4343 'dropbox': 'dropbox',
@@ -56,7 +56,6 @@ ICON_NAMES = {
5656 'qt-play': 'applications-games',
5757 'maintenance': 'baobab',
5858 'movie': 'artemanufrij.screencast',
59- 'mycroft': 'deepin-voice-recorder',
6059 'graphic_drivers': 'gnome-system',
6160 'lamp': 'applications-internet',
6261 'lts': 'applications-accessories',
@@ -83,7 +82,7 @@ ICON_NAMES = {
8382 ADVANCED = [ 'lamp', 'sshd', 'visual', 'firewire', 'broadcom', 'nautilus', 'nemo', 'email', 'wallpapers', 'hunspell' ]
8483
8584 # 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']
8786
8887 # See http://docs.python.org/2/library/gettext.html "22.1.3.4. Deferred translations"
8988 def _(message):
@@ -113,7 +112,6 @@ TITLES = {
113112 'hardinfo': _("Hardware Analysis"),
114113 'maintenance': _("Applications to Perform System Maintenance"),
115114 'movie': _("Common Video Editing Programs for Linux"),
116- 'mycroft': _("Mycroft"),
117115 'graphics': _("Common Photo editing Programs for Linux"),
118116 'hunspell': _("Spell Check"),
119117 'lamp': _("Apache (or Nginx) + Mariadb + PHP"),
@@ -158,7 +156,6 @@ DESCRIPTIONS = {
158156 'qt-play': _("Popular games for Linux, all created for use on your Desktop Environment"),
159157 'maintenance': _("Common Applications to Perform System Maintenance On Linux"),
160158 'movie': _("Common video editing programs for Linux"),
161- 'mycroft': _("An Open Source alternative to AIs such as Amazon's Alexa and Apple's Siri"),
162159 'graphics': _("Common Photo editing Programs for Linux"),
163160 'lamp': _("Apache (or Nginx) + Mariadb + PHP installation and setup."),
164161 'cups': _("Installation of printer drivers and management tools."),
@@ -276,9 +273,6 @@ TOOLTIPS = {
276273 "programs in a file so that you can reinstall them later."),
277274 'movie': _("Common video editing programs for Linux, such as Open Shot, KdenLive,\n"
278275 "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"),
282276 'graphics': _("Common Photo editing Programs for Linux, such as Gimp, GtThumb,\n"
283277 "Rapid Photo Downloader, Rawtherapee, and DarkTable"),
284278 'lamp': _("This option installs a web server (you can choose\n"
--- a/Cnchi/info.py
+++ b/Cnchi/info.py
@@ -29,7 +29,7 @@
2929
3030 """ Set some Cnchi global constants """
3131
32-CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.09"
32+CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.14"
3333 CNCHI_WEBSITE = "https://rebornos.org"
3434 CNCHI_RELEASE_STAGE = "production"
3535
--- a/Cnchi/packages.xml
+++ b/Cnchi/packages.xml
@@ -429,9 +429,6 @@
429429 <pkgname>pitivi</pkgname>
430430 <pkgname>avidemux-cli</pkgname>
431431 </feature>
432- <feature name="mycroft">
433- <pkgname>mycroft-reborn</pkgname>
434- </feature>
435432 <feature name="plymouth">
436433 <pkgname>plymouth</pkgname>
437434 <pkgname>arch-plymouthize</pkgname>
--- a/Cnchi/postinstall.sh
+++ b/Cnchi/postinstall.sh
@@ -200,14 +200,14 @@ mate_settings() {
200200
201201 cp ${APP_LIST} "${CN_DESTDIR}/usr/lib/linuxmint/mintMenu/applications.list"
202202
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"
211211 }
212212
213213 nox_settings() {
@@ -223,9 +223,9 @@ lxqt_settings() {
223223 set_dmrc razor
224224 }
225225
226-enlightenment_settings() {
227- set_gsettings
228- set_xscreensaver
226+#enlightenment_settings() {
227+# set_gsettings
228+# set_xscreensaver
229229
230230 # http://git.enlightenment.org/core/enlightenment.git/plain/data/tools/enlightenment_remote
231231
@@ -234,23 +234,23 @@ enlightenment_settings() {
234234 #chroot ${CN_DESTDIR} /usr/bin/antergos-desktop enlightenment ${CN_USER_NAME}
235235
236236 # 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"
239239
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
246246
247- set_dmrc enlightenment
247+# set_dmrc enlightenment
248248
249- echo "QT_STYLE_OVERRIDE=gtk" >> ${CN_DESTDIR}/etc/environment
249+# echo "QT_STYLE_OVERRIDE=gtk" >> ${CN_DESTDIR}/etc/environment
250250
251251 # 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+#}
254254
255255 budgie_settings() {
256256 set_gsettings
@@ -349,10 +349,6 @@ postinstall() {
349349 if [[ deepin = "${CN_DESKTOP}" ]]; then
350350 rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf
351351 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
356352 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
357353 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
358354 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -368,9 +364,6 @@ postinstall() {
368364
369365 if [[ gnome = "${CN_DESKTOP}" ]]; then
370366 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
374367 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
375368 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
376369 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -386,30 +379,24 @@ postinstall() {
386379 chroot ${CN_DESTDIR} /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
387380 fi
388381
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
406396
407397 if [[ kde = "${CN_DESKTOP}" ]]; then
408398 chroot ${CN_DESTDIR} systemctl -fq enable sddm
409399 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
413400 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
414401 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
415402 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -424,9 +411,6 @@ postinstall() {
424411 chroot ${CN_DESTDIR} systemctl -fq enable lightdm
425412 sed -i 's/^webkit_theme\s*=\s*\(.*\)/webkit_theme = lightdm-webkit-theme-aether #\1/g' ${CN_DESTDIR}/etc/lightdm/lightdm-webkit2-greeter.conf
426413 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
430414 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
431415 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
432416 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -443,9 +427,6 @@ postinstall() {
443427 if [[ i3 = "${CN_DESKTOP}" ]]; then
444428 chroot ${CN_DESTDIR} systemctl -fq enable sddm
445429 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
449430 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
450431 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
451432 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -459,31 +440,25 @@ postinstall() {
459440 chroot ${CN_DESTDIR} systemctl enable ufw
460441 fi
461442
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
480458
481459 if [[ lxqt = "${CN_DESKTOP}" ]]; then
482460 chroot ${CN_DESTDIR} systemctl -fq enable sddm
483461 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
487462 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
488463 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
489464 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -499,9 +474,6 @@ postinstall() {
499474 cp /usr/share/cnchi/lightdm-webkit2-greeter.conf ${CN_DESTDIR}/etc/lightdm/
500475 chmod go=rx ${CN_DESTDIR}/var/lib/lightdm-data
501476 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
505477 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
506478 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
507479 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -520,9 +492,6 @@ postinstall() {
520492 if [[ mate = "${CN_DESKTOP}" ]]; then
521493 chroot ${CN_DESTDIR} systemctl -fq enable sddm
522494 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
526495 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
527496 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
528497 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -542,9 +511,6 @@ postinstall() {
542511 if [[ xfce = "${CN_DESKTOP}" ]]; then
543512 chroot ${CN_DESTDIR} systemctl -fq enable sddm
544513 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
548514 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
549515 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
550516 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -561,9 +527,6 @@ fi
561527 if [[ cinnamon = "${CN_DESKTOP}" ]]; then
562528 chroot ${CN_DESTDIR} systemctl -fq enable sddm
563529 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
567530 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
568531 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
569532 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -582,9 +545,6 @@ fi
582545 if [[ pantheon = "${CN_DESKTOP}" ]]; then
583546 chroot ${CN_DESTDIR} systemctl -fq enable sddm
584547 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
588548 cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/
589549 cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/
590550 cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/
@@ -598,24 +558,21 @@ if [[ pantheon = "${CN_DESKTOP}" ]]; then
598558 chroot ${CN_DESTDIR} systemctl enable ufw
599559 fi
600560
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
619576
620577 # Copy pacman.conf file over
621578 rm ${CN_DESTDIR}/etc/pacman.conf
--- a/packages.both
+++ b/packages.both
@@ -115,7 +115,8 @@ xdg-desktop-portal-gtk
115115 xscreensaver
116116
117117
118-reborn-updates
118+# reborn-updates --> Changed now with rebornos-fire
119+rebornos-fire
119120 bubblewrap
120121
121122
--- a/scripts/flatpak.desktop
+++ b/scripts/flatpak.desktop
@@ -1,6 +1,6 @@
11 [Desktop Entry]
22 Comment=Flatpak For Reborn
3-Exec=gksu flatpak.sh
3+Exec=flatpak.sh
44 GenericName=Flatpak Installer
55 Icon=/usr/share/icons/default/reborn-updates.svg
66 Name=Flatpak Installer
Show on old repository browser