2020.05.10 update

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

diff --git a/Cnchi/postinstall.sh b/Cnchi/postinstall.sh
index db50504..63abc87 100755 (executable)
--- a/Cnchi/postinstall.sh
+++ b/Cnchi/postinstall.sh
@@ -52,7 +52,7 @@ set_xscreensaver() {
 set_gsettings() {
     # Set gsettings input-source
     CN_KEYBOARD=""
-    CN_INPUT_SCHEMA="${CN_DESTDIR}/usr/share/glib-2.0/schemas/90_antergos.input-sources.gschema.override"
+    CN_INPUT_SCHEMA="${CN_DESTDIR}/usr/share/glib-2.0/schemas/90_rebornos.input-sources.gschema.override"
     if [[ "${CN_KEYBOARD_LAYOUT}" != '' ]]; then
         if [[ "${CN_KEYBOARD_VARIANT}" != '' ]]; then
             CN_KEYBOARD=${CN_KEYBOARD_LAYOUT}+${CN_KEYBOARD_VARIANT}
@@ -67,7 +67,7 @@ set_gsettings() {
     fi
 
     # Set default Internet browser
-    for CN_SCHEMA_OVERRIDE in ${CN_DESTDIR}/usr/share/glib-2.0/schemas/90_antergos*; do
+    for CN_SCHEMA_OVERRIDE in ${CN_DESTDIR}/usr/share/glib-2.0/schemas/90_rebornos*; do
         if [ "${CN_BROWSER}" != "" ]; then
             sed -i "s|chromium|${CN_BROWSER}|g" "${CN_SCHEMA_OVERRIDE}"
         else
@@ -337,6 +337,9 @@ postinstall() {
     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
+    
+    # reborn-mirrorlist permission change
+    chroot ${CN_DESTDIR} chmod 644 /etc/pacman.d/reborn-mirrorlist
 
     # Configure makepkg so that it doesn't compress packages after building.
     # Most users are building packages to install them locally so there's no need for compression.
@@ -379,6 +382,8 @@ postinstall() {
         echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Gnome Desktop <---" >> ${CN_DESTDIR}/etc/environment
         chroot ${CN_DESTDIR} systemctl enable earlyoom
         chroot ${CN_DESTDIR} systemctl enable ufw
+        cp /usr/share/cnchi/101_gnome.gschema.override ${CN_DESTDIR}/usr/share/glib-2.0/schemas/
+        chroot ${CN_DESTDIR} /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
     fi
 
     if [[ apricity = "${CN_DESKTOP}" ]]; then
@@ -570,6 +575,8 @@ if [[ cinnamon = "${CN_DESKTOP}" ]]; then
         echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Cinnamon Desktop <---" >> ${CN_DESTDIR}/etc/environment
         chroot ${CN_DESTDIR} systemctl enable earlyoom
         chroot ${CN_DESTDIR} systemctl enable ufw
+        cp /usr/share/cnchi/95_cinnamon.gschema.override ${CN_DESTDIR}/usr/share/glib-2.0/schemas/
+        chroot ${CN_DESTDIR} /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
 fi
 
 if [[ pantheon = "${CN_DESKTOP}" ]]; then