OSDN Git Service

(root) / rebornos / cnchi-gnome-osdn.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Update to 2020.12.04
[rebornos/cnchi-gnome-osdn.git] / Cnchi / postinstall.sh
diff --git a/Cnchi/postinstall.sh b/Cnchi/postinstall.sh
index 4f1a4b4..90d88de 100755 (executable)
--- a/Cnchi/postinstall.sh
+++ b/Cnchi/postinstall.sh
@@ -168,7 +168,7 @@ kde_settings() {
     set_dmrc kde-plasma
 
     # Force QtCurve to use our theme
-    rm -R ${CN_DESTDIR}/usr/share/kstyle/themes/qtcurve.themerc
+    # rm -R ${CN_DESTDIR}/usr/share/kstyle/themes/qtcurve.themerc
 
     # Setup user defaults
     #if [ -f "${CN_DESTDIR}/usr/share/antergos-kde-setup/install.sh" ]; then
@@ -177,11 +177,11 @@ kde_settings() {
     #    chroot ${CN_DESTDIR} /usr/bin/antergos-desktop plasma ${CN_USER_NAME}
     #fi
 
-    cp ${CN_DESTDIR}/etc/skel/.gtkrc-2.0-kde4 ${CN_DESTDIR}/root
-    chroot ${CN_DESTDIR} "ln -s /root/.gtkrc-2.0-kde4 /root/.gtkrc-2.0"
+    # cp ${CN_DESTDIR}/etc/skel/.gtkrc-2.0-kde4 ${CN_DESTDIR}/root
+    # chroot ${CN_DESTDIR} "ln -s /root/.gtkrc-2.0-kde4 /root/.gtkrc-2.0"
 
     # Set default directories
-    chroot ${CN_DESTDIR} su -c xdg-user-dirs-update ${CN_USER_NAME}
+    # chroot ${CN_DESTDIR} su -c xdg-user-dirs-update ${CN_USER_NAME}
 }
 
 mate_settings() {
@@ -307,9 +307,12 @@ postinstall() {
     fi
 
     # Set RebornOS name in filesystem files
-    cp /etc/arch-release "${CN_DESTDIR}/etc/"
-    cp /etc/os-release "${CN_DESTDIR}/etc/"
+    cp /etc/arch-release ${CN_DESTDIR}/etc/
+    # cp /etc/os-release "${CN_DESTDIR}/etc/"
     sed -i 's|Arch|RebornOS|g' "${CN_DESTDIR}/etc/issue"
+    # os-release updated for RebornOS
+    rm ${CN_DESTDIR}/usr/lib/os-release
+    cp /usr/share/cnchi/os-release ${CN_DESTDIR}/usr/lib/
 
     # Set common desktop settigns
     common_settings
@@ -333,10 +336,14 @@ postinstall() {
         echo "# ---> End added by Cnchi RebornOS Installer Gnome based <--- #" >> "${file}"
     done
 
-    # Uncomplicated Firewall Workaround (Rafael from RebornOS)
-    cp /usr/share/cnchi/gufw.svg ${CN_DESTDIR}/usr/share/icons/default/gufw.svg
-    cp /usr/share/cnchi/gufw.png ${CN_DESTDIR}/usr/share/icons/hicolor/48x48/apps/gufw.png
-    cp /usr/share/cnchi/gufw.desktop ${CN_DESTDIR}/usr/share/applications/gufw.desktop
+    # Uncomplicated Firewall Workaround (Rafael from RebornOS) Already solved by latest package update
+    # cp /usr/share/cnchi/gufw.svg ${CN_DESTDIR}/usr/share/icons/default/gufw.svg
+    # cp /usr/share/cnchi/gufw.png ${CN_DESTDIR}/usr/share/icons/hicolor/48x48/apps/gufw.png
+    # cp /usr/share/cnchi/gufw.desktop ${CN_DESTDIR}/usr/share/applications/gufw.desktop
+
+    # Start cups.service
+    chroot ${CN_DESTDIR} systemctl enable cups.service
+
     
     # reborn-mirrorlist permission change
     chroot ${CN_DESTDIR} chmod 644 /etc/pacman.d/reborn-mirrorlist
@@ -379,7 +386,14 @@ postinstall() {
         chroot ${CN_DESTDIR} /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
         # Delete a remnant of lightdm
         # If at any time you want to use lightdm as access, you should comment on this line:
-        rm ${CN_DESTDIR}/etc/lightdm
+        # rm ${CN_DESTDIR}/etc/lightdm
+        rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf
+        cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/
+        echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
     fi
 
 #    if [[ apricity = "${CN_DESKTOP}" ]]; then
@@ -408,10 +422,18 @@ postinstall() {
         cp /usr/share/cnchi/updating.sh ${CN_DESTDIR}/usr/bin/
         chroot ${CN_DESTDIR} systemctl enable earlyoom
         chroot ${CN_DESTDIR} systemctl enable ufw
-        chroot ${CN_DESTDIR} pacman -S rebornos-kde-customization --noconfirm
+        #==>> KDE customization removed as it does not install properly >>==#
+        # chroot ${CN_DESTDIR} pacman -S rebornos-kde-customization --noconfirm
         # Delete a remnant of lightdm
         # If at any time you want to use lightdm as access, you should comment on this line:
-        rm ${CN_DESTDIR}/etc/lightdm
+        # rm ${CN_DESTDIR}/etc/lightdm
+        rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf
+        cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/
+        echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
     fi
 
     if [[ budgie = "${CN_DESKTOP}" ]]; then
@@ -490,8 +512,8 @@ postinstall() {
  #   fi
 
     if [[ lxqt = "${CN_DESKTOP}" ]]; then
-        chroot ${CN_DESTDIR} systemctl -fq enable sddm.service
-        # chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service
+        # chroot ${CN_DESTDIR} systemctl -fq enable sddm.service
+        chroot ${CN_DESTDIR} systemctl -fq enable lightdm.service
         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/
@@ -503,7 +525,14 @@ postinstall() {
         chroot ${CN_DESTDIR} systemctl enable ufw
         # Delete a remnant of lightdm
         # If at any time you want to use lightdm as access, you should comment on this line:
-        rm ${CN_DESTDIR}/etc/lightdm
+        # rm ${CN_DESTDIR}/etc/lightdm
+        rm ${CN_DESTDIR}/etc/lightdm/lightdm.conf
+        cp /usr/share/cnchi/lightdm.conf ${CN_DESTDIR}/etc/lightdm/
+        echo "[greeter]" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "theme-name = Flat-Plat-Blue" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "icon-theme-name = Flat-Remix-Green" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "background = /usr/share/pixmaps/rebornos.jpg" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
+        echo "default-user-image = /usr/share/pixmaps/avatar.png" >> ${CN_DESTDIR}/etc/lightdm/lightdm-gtk-greeter.conf
     fi
 
     if [ -f "${CN_DESTDIR}/usr/bin/lxsession" ]; then
RebornOS cnchi Gnome based install code
About OSDN
Find Software
Develop Software
Help