From: Rafael Costa Rega Date: Thu, 14 May 2020 22:57:31 +0000 (-0300) Subject: 2020.05.14 update X-Git-Url: http://git.osdn.net/view?p=rebornos%2Fcnchi-gnome-osdn.git;a=commitdiff_plain;h=bc61341e07fbbf56d07935f171b71cb7d163b634;hp=265f80d955a5f09e115748bc96ed83d18cc84f46;ds=sidebyside 2020.05.14 update --- diff --git a/Cnchi/desktop_info.py b/Cnchi/desktop_info.py index 4189e60..d183aff 100644 --- a/Cnchi/desktop_info.py +++ b/Cnchi/desktop_info.py @@ -29,12 +29,13 @@ """ Desktop Environments information """ +# Disabled desktops(in DESKTOPS_DEV = DESKTOPS : "enlightenment", "windows", "apricity" # Enabled desktops DESKTOPS = ["base", "cinnamon", "deepin", "gnome", "kde", "mate", "openbox", "xfce"] -DESKTOPS_DEV = DESKTOPS + ["budgie", "enlightenment", "i3", "lxqt", "pantheon", "windows", "apricity"] +DESKTOPS_DEV = DESKTOPS + ["budgie", "i3", "lxqt", "pantheon"] DESKTOPS_A11Y = ["gnome", "mate", "apricity"] @@ -73,11 +74,11 @@ LIBS = { 'qt': ["kde", "lxqt"] } -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"] +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"] # Not all desktops have all features EXCLUDED_FEATURES = { - '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"], + '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"], 'apricity': ["lamp", "visual", "nautilus", "qt-play"], 'cinnamon': ["lamp", "visual", "nemo", "qt-play"], 'deepin': ["lamp", "visual", "qt-play"], diff --git a/Cnchi/features_info.py b/Cnchi/features_info.py index 0fb8bfb..4db0a99 100755 --- a/Cnchi/features_info.py +++ b/Cnchi/features_info.py @@ -37,7 +37,7 @@ ICON_NAMES = { 'a11y': 'preferences-desktop-accessibility', 'aur': 'system-software-install', 'bluetooth': 'bluetooth', - 'broadcom':'cs-drivers', + 'broadcom': 'cs-drivers', 'cups': 'printer', 'chromium': 'chromium', 'dropbox': 'dropbox', @@ -56,7 +56,6 @@ ICON_NAMES = { 'qt-play': 'applications-games', 'maintenance': 'baobab', 'movie': 'artemanufrij.screencast', - 'mycroft': 'deepin-voice-recorder', 'graphic_drivers': 'gnome-system', 'lamp': 'applications-internet', 'lts': 'applications-accessories', @@ -83,7 +82,7 @@ ICON_NAMES = { ADVANCED = [ 'lamp', 'sshd', 'visual', 'firewire', 'broadcom', 'nautilus', 'nemo', 'email', 'wallpapers', 'hunspell' ] # These features are considered 'basic', and will be shown by default -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'] +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'] # See http://docs.python.org/2/library/gettext.html "22.1.3.4. Deferred translations" def _(message): @@ -113,7 +112,6 @@ TITLES = { 'hardinfo': _("Hardware Analysis"), 'maintenance': _("Applications to Perform System Maintenance"), 'movie': _("Common Video Editing Programs for Linux"), - 'mycroft': _("Mycroft"), 'graphics': _("Common Photo editing Programs for Linux"), 'hunspell': _("Spell Check"), 'lamp': _("Apache (or Nginx) + Mariadb + PHP"), @@ -158,7 +156,6 @@ DESCRIPTIONS = { 'qt-play': _("Popular games for Linux, all created for use on your Desktop Environment"), 'maintenance': _("Common Applications to Perform System Maintenance On Linux"), 'movie': _("Common video editing programs for Linux"), - 'mycroft': _("An Open Source alternative to AIs such as Amazon's Alexa and Apple's Siri"), 'graphics': _("Common Photo editing Programs for Linux"), 'lamp': _("Apache (or Nginx) + Mariadb + PHP installation and setup."), 'cups': _("Installation of printer drivers and management tools."), @@ -276,9 +273,6 @@ TOOLTIPS = { "programs in a file so that you can reinstall them later."), 'movie': _("Common video editing programs for Linux, such as Open Shot, KdenLive,\n" "Pitivi, and Avidemux"), - 'mycroft': _("Open Source alternative to AIs such as Amazon's Alexa and Apple's Siri. Just like other AIs,\n" - "Mycroft is voice activated and can perform numerous tasks. However, unlike other IAs,\n" - "Mycroft does NOT collect any information on its users - keeping your privacy intact"), 'graphics': _("Common Photo editing Programs for Linux, such as Gimp, GtThumb,\n" "Rapid Photo Downloader, Rawtherapee, and DarkTable"), 'lamp': _("This option installs a web server (you can choose\n" diff --git a/Cnchi/info.py b/Cnchi/info.py index 02f5155..91c8cf8 100755 --- a/Cnchi/info.py +++ b/Cnchi/info.py @@ -29,7 +29,7 @@ """ Set some Cnchi global constants """ -CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.09" +CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.14" CNCHI_WEBSITE = "https://rebornos.org" CNCHI_RELEASE_STAGE = "production" diff --git a/Cnchi/packages.xml b/Cnchi/packages.xml index 1f8b25c..37e37d8 100755 --- a/Cnchi/packages.xml +++ b/Cnchi/packages.xml @@ -429,9 +429,6 @@ pitivi avidemux-cli - - mycroft-reborn - plymouth arch-plymouthize diff --git a/Cnchi/postinstall.sh b/Cnchi/postinstall.sh index 63abc87..6a27f70 100755 --- a/Cnchi/postinstall.sh +++ b/Cnchi/postinstall.sh @@ -200,14 +200,14 @@ mate_settings() { cp ${APP_LIST} "${CN_DESTDIR}/usr/lib/linuxmint/mintMenu/applications.list" - # Work-around for bug in mate-panel - CN_POST_INSTALL_DIR=/usr/share/cnchi/scripts/postinstall - CN_HOTFIX_SCRIPT="${CN_POST_INSTALL_DIR}/first-boot-hotfix.sh" - CN_HOTFIX_DESKTOP="${CN_POST_INSTALL_DIR}/first-boot-hotfix.desktop" - cp "${CN_HOTFIX_SCRIPT}" "${CN_DESTDIR}/usr/bin" - mkdir -p "${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart" - cp "${CN_HOTFIX_DESKTOP}" "${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart" - chmod +x "${CN_DESTDIR}/usr/bin/first-boot-hotfix.sh" + # Work-around for bug in mate-panel - Fixed now in line 501 (Rafael from RebornOS) + #CN_POST_INSTALL_DIR=/usr/share/cnchi/scripts/postinstall + #CN_HOTFIX_SCRIPT="${CN_POST_INSTALL_DIR}/first-boot-hotfix.sh" + #CN_HOTFIX_DESKTOP="${CN_POST_INSTALL_DIR}/first-boot-hotfix.desktop" + #cp "${CN_HOTFIX_SCRIPT}" "${CN_DESTDIR}/usr/bin" + #mkdir -p "${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart" + #cp "${CN_HOTFIX_DESKTOP}" "${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart" + #chmod +x "${CN_DESTDIR}/usr/bin/first-boot-hotfix.sh" } nox_settings() { @@ -223,9 +223,9 @@ lxqt_settings() { set_dmrc razor } -enlightenment_settings() { - set_gsettings - set_xscreensaver +#enlightenment_settings() { +# set_gsettings +# set_xscreensaver # http://git.enlightenment.org/core/enlightenment.git/plain/data/tools/enlightenment_remote @@ -234,23 +234,23 @@ enlightenment_settings() { #chroot ${CN_DESTDIR} /usr/bin/antergos-desktop enlightenment ${CN_USER_NAME} # Set Keyboard layout - E_CFG="/home/${CN_USER_NAME}/.e/e/config/standard/e.cfg" - E_SRC="/home/${CN_USER_NAME}/.e/e/config/standard/e.src" +# E_CFG="/home/${CN_USER_NAME}/.e/e/config/standard/e.cfg" +# E_SRC="/home/${CN_USER_NAME}/.e/e/config/standard/e.src" - ${CN_DESTDIR}/usr/bin/eet -d ${E_CFG} config ${E_SRC} - sed -i 's/"us"/"${CN_KEYBOARD_LAYOUT}"/' ${E_SRC} - if [[ "${CN_KEYBOARD_VARIANT}" != '' ]]; then - sed -i 's/"basic"/"${CN_KEYBOARD_VARIANT}"/' ${E_SRC} - fi - ${CN_DESTDIR}/usr/bin/eet -e ${E_CFG} config ${E_SRC} 1 +# ${CN_DESTDIR}/usr/bin/eet -d ${E_CFG} config ${E_SRC} +# sed -i 's/"us"/"${CN_KEYBOARD_LAYOUT}"/' ${E_SRC} +# if [[ "${CN_KEYBOARD_VARIANT}" != '' ]]; then +# sed -i 's/"basic"/"${CN_KEYBOARD_VARIANT}"/' ${E_SRC} +# fi +# ${CN_DESTDIR}/usr/bin/eet -e ${E_CFG} config ${E_SRC} 1 - set_dmrc enlightenment +# set_dmrc enlightenment - echo "QT_STYLE_OVERRIDE=gtk" >> ${CN_DESTDIR}/etc/environment +# echo "QT_STYLE_OVERRIDE=gtk" >> ${CN_DESTDIR}/etc/environment # Add lxpolkit to autostart apps - cp /etc/xdg/autostart/lxpolkit.desktop ${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart -} +# cp /etc/xdg/autostart/lxpolkit.desktop ${CN_DESTDIR}/home/${CN_USER_NAME}/.config/autostart +#} budgie_settings() { set_gsettings @@ -349,10 +349,6 @@ postinstall() { if [[ deepin = "${CN_DESKTOP}" ]]; then rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf cp /etc/lightdm/lightdm.conf ${CN_DESTDIR}/etc/lightdm/ - # chroot ${CN_DESTDIR} sudo pacman -Rdd deepin-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd qt5ct --noconfirm --> Not installed now cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -368,9 +364,6 @@ postinstall() { if [[ gnome = "${CN_DESKTOP}" ]]; then chroot ${CN_DESTDIR} systemctl -fq enable gdm - # chroot ${CN_DESTDIR} sudo pacman -Rdd gnome-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -386,30 +379,24 @@ postinstall() { chroot ${CN_DESTDIR} /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas fi - if [[ apricity = "${CN_DESKTOP}" ]]; then - chroot ${CN_DESTDIR} systemctl -fq enable gdm - # chroot ${CN_DESTDIR} sudo pacman -Rdd gnome-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm - cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ - cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ - cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ - cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/ - cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/ - cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/ - echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment - echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment - echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment - chroot ${CN_DESTDIR} systemctl enable earlyoom - chroot ${CN_DESTDIR} systemctl enable ufw - fi +# if [[ apricity = "${CN_DESKTOP}" ]]; then +# chroot ${CN_DESTDIR} systemctl -fq enable gdm +# cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ +# cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ +# cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ +# cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/ +# cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/ +# cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/ +# echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment +# echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment +# echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Apricity Desktop <---" >> ${CN_DESTDIR}/etc/environment +# chroot ${CN_DESTDIR} systemctl enable earlyoom +# chroot ${CN_DESTDIR} systemctl enable ufw +# fi if [[ kde = "${CN_DESKTOP}" ]]; then chroot ${CN_DESTDIR} systemctl -fq enable sddm cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ - # chroot ${CN_DESTDIR} sudo pacman -Rdd kde-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -424,9 +411,6 @@ postinstall() { chroot ${CN_DESTDIR} systemctl -fq enable lightdm sed -i 's/^webkit_theme\s*=\s*\(.*\)/webkit_theme = lightdm-webkit-theme-aether #\1/g' ${CN_DESTDIR}/etc/lightdm/lightdm-webkit2-greeter.conf sed -i 's/^\(#?greeter\)-session\s*=\s*\(.*\)/greeter-session = lightdm-webkit2-greeter #\1/ #\2g' ${CN_DESTDIR}/etc/lightdm/lightdm.conf - # chroot ${CN_DESTDIR} sudo pacman -Rdd budgie-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -443,9 +427,6 @@ postinstall() { if [[ i3 = "${CN_DESKTOP}" ]]; then chroot ${CN_DESTDIR} systemctl -fq enable sddm cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ - # chroot ${CN_DESTDIR} sudo pacman -Rdd i3-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -459,31 +440,25 @@ postinstall() { chroot ${CN_DESTDIR} systemctl enable ufw fi - if [ -f "${CN_DESTDIR}/usr/bin/enlightenment" ]; then - chroot ${CN_DESTDIR} systemctl -fq enable sddm - cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ - # chroot ${CN_DESTDIR} sudo pacman -Rdd enlightenment-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm - cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ - cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ - cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ - cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/ - cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/ - cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/ - echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment - echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment - echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment - chroot ${CN_DESTDIR} systemctl enable earlyoom - chroot ${CN_DESTDIR} systemctl enable ufw - fi + # if [ -f "${CN_DESTDIR}/usr/bin/enlightenment" ]; then + # chroot ${CN_DESTDIR} systemctl -fq enable sddm + # cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ + # cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ + # cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ + # cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ + # cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/ + # cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/ + # cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/ + # echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment + # echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment + # echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Enlightenment Desktop <---" >> ${CN_DESTDIR}/etc/environment + # chroot ${CN_DESTDIR} systemctl enable earlyoom + # chroot ${CN_DESTDIR} systemctl enable ufw + # fi if [[ lxqt = "${CN_DESKTOP}" ]]; then chroot ${CN_DESTDIR} systemctl -fq enable sddm cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ - # chroot ${CN_DESTDIR} sudo pacman -Rdd lxqt-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -499,9 +474,6 @@ postinstall() { cp /usr/share/cnchi/lightdm-webkit2-greeter.conf ${CN_DESTDIR}/etc/lightdm/ chmod go=rx ${CN_DESTDIR}/var/lib/lightdm-data chroot ${CN_DESTDIR} systemctl -fq enable lxdm - # chroot ${CN_DESTDIR} sudo pacman -Rdd openbox-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -520,9 +492,6 @@ postinstall() { if [[ mate = "${CN_DESKTOP}" ]]; then chroot ${CN_DESTDIR} systemctl -fq enable sddm cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ - # chroot ${CN_DESTDIR} sudo pacman -Rdd mate-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -542,9 +511,6 @@ postinstall() { if [[ xfce = "${CN_DESKTOP}" ]]; then chroot ${CN_DESTDIR} systemctl -fq enable sddm cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ - # chroot ${CN_DESTDIR} sudo pacman -Rdd xfce-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -561,9 +527,6 @@ fi if [[ cinnamon = "${CN_DESKTOP}" ]]; then chroot ${CN_DESTDIR} systemctl -fq enable sddm cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ - # chroot ${CN_DESTDIR} sudo pacman -Rdd cinnamon-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -582,9 +545,6 @@ fi if [[ pantheon = "${CN_DESKTOP}" ]]; then chroot ${CN_DESTDIR} systemctl -fq enable sddm cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd elementary-cosmic-reborn --noconfirm cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ @@ -598,24 +558,21 @@ if [[ pantheon = "${CN_DESKTOP}" ]]; then chroot ${CN_DESTDIR} systemctl enable ufw fi -if [[ windows = "${CN_DESKTOP}" ]]; then - chroot ${CN_DESTDIR} systemctl -fq enable sddm - cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ - # chroot ${CN_DESTDIR} sudo pacman -Rdd cinnamon-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd common-cosmic-reborn --noconfirm - # chroot ${CN_DESTDIR} sudo pacman -Rdd graphic-cosmic-reborn --noconfirm - cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ - cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ - cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ - cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/ - cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/ - cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/ - echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment - echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment - echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment - chroot ${CN_DESTDIR} systemctl enable earlyoom - chroot ${CN_DESTDIR} systemctl enable ufw -fi +#if [[ windows = "${CN_DESKTOP}" ]]; then +# chroot ${CN_DESTDIR} systemctl -fq enable sddm +# cp /usr/share/cnchi/sddm.conf ${CN_DESTDIR}/etc/ +# cp /usr/share/cnchi/flatpak.sh ${CN_DESTDIR}/usr/bin/ +# cp /usr/share/cnchi/pkcon.sh ${CN_DESTDIR}/usr/bin/ +# cp /usr/share/cnchi/pkcon2.sh ${CN_DESTDIR}/usr/bin/ +# cp /usr/share/cnchi/flatpak.desktop ${CN_DESTDIR}/usr/share/applications/ +# cp /usr/share/cnchi/update.desktop ${CN_DESTDIR}/etc/xdg/autostart/ +# cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/ +# echo "# ---> Added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment +# echo "QT_QPA_PLATFORMTHEME=qt5ct" >> ${CN_DESTDIR}/etc/environment +# echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Windows Desktop <---" >> ${CN_DESTDIR}/etc/environment +# chroot ${CN_DESTDIR} systemctl enable earlyoom +# chroot ${CN_DESTDIR} systemctl enable ufw +#fi # Copy pacman.conf file over rm ${CN_DESTDIR}/etc/pacman.conf diff --git a/packages.both b/packages.both index 107c748..242d93b 100755 --- a/packages.both +++ b/packages.both @@ -115,7 +115,8 @@ xdg-desktop-portal-gtk xscreensaver -reborn-updates +# reborn-updates --> Changed now with rebornos-fire +rebornos-fire bubblewrap diff --git a/scripts/flatpak.desktop b/scripts/flatpak.desktop index 6f2daaf..ec96146 100644 --- a/scripts/flatpak.desktop +++ b/scripts/flatpak.desktop @@ -1,6 +1,6 @@ [Desktop Entry] Comment=Flatpak For Reborn -Exec=gksu flatpak.sh +Exec=flatpak.sh GenericName=Flatpak Installer Icon=/usr/share/icons/default/reborn-updates.svg Name=Flatpak Installer