2020.05.14 update

[rebornos/cnchi-gnome-osdn.git] / Cnchi / postinstall.sh

diff --git a/Cnchi/postinstall.sh b/Cnchi/postinstall.sh
index 63abc87..6a27f70 100755 (executable)
--- 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"
 
 
     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() {
 }
 
 nox_settings() {


@@ -223,9 +223,9 @@ lxqt_settings() {
     set_dmrc razor
 }
 
     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
 
 
     # 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
     #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
 
     # 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
 
 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/
     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/
         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
 
     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/
         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
 
         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/
 
     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/
         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} 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/
         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/
     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/
         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
 
         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/
 
     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/
         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
         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/
         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/
     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/
         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/
 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/
         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/
 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/
         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/
 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/
         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
 
         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
 
     # Copy pacman.conf file over
     rm ${CN_DESTDIR}/etc/pacman.conf