From: Rafael Costa Rega Date: Sat, 5 Dec 2020 13:09:35 +0000 (-0300) Subject: Update to 2020.12.04 X-Git-Url: http://git.osdn.net/view?p=rebornos%2Fcnchi-gnome-osdn.git;a=commitdiff_plain;h=e68840f53e25cc7b293a4a0eef3fb339f35f38f0 Update to 2020.12.04 --- diff --git a/CHANGELOG b/CHANGELOG index 8f7bcf4..914fa8b 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -379,6 +379,32 @@ background = /usr/share/pixmaps/rebornos.jpg default-user-image = /usr/share/pixmaps/avatar.png }}} +========================================================================= + +2020.08.19 + +In 101_gnome.gschema.override (Cnchi subdirectory), 'dash-to-panel@jderose9.github.com' It is eliminated + +Before: + +[org.gnome.shell] +enabled-extensions=['dash-to-panel@jderose9.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'appindicatorsupport@rgcjonas.gmail.com', 'screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'pamac-updates@manjaro.org'] +always-show-log-out=true + + +After: + +[org.gnome.shell] +enabled-extensions=['drive-menu@gnome-shell-extensions.gcampax.github.com', 'appindicatorsupport@rgcjonas.gmail.com', 'screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'pamac-updates@manjaro.org'] +always-show-log-out=true + + +========================================================================= +2020.11.30 +Add in postinstall.sh new start cups service (line 344 aprox.): + # Start cups.service + chroot ${CN_DESTDIR} systemctl enable cups.service + \ No newline at end of file diff --git a/Cnchi/101_gnome.gschema.override b/Cnchi/101_gnome.gschema.override index d2072c4..8d0376b 100644 --- a/Cnchi/101_gnome.gschema.override +++ b/Cnchi/101_gnome.gschema.override @@ -26,7 +26,7 @@ show-create-link=true picture-uri='file:///usr/share/backgrounds/gnome/adwaita-day.jpg' [org.gnome.shell] -enabled-extensions=['dash-to-panel@jderose9.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'appindicatorsupport@rgcjonas.gmail.com', 'screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'pamac-updates@manjaro.org'] +enabled-extensions=['drive-menu@gnome-shell-extensions.gcampax.github.com', 'appindicatorsupport@rgcjonas.gmail.com', 'screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com', 'user-theme@gnome-shell-extensions.gcampax.github.com', 'pamac-updates@manjaro.org'] always-show-log-out=true [org.gnome.settings-daemon.plugins.xsettings] diff --git a/Cnchi/info.py b/Cnchi/info.py index 6a249b6..01856c4 100755 --- a/Cnchi/info.py +++ b/Cnchi/info.py @@ -3,7 +3,7 @@ # # info.py # -# Copyright © 2013-2019 RebornOS +# Copyright © 2013-2020 RebornOS # # This file is part of Cnchi. # @@ -29,7 +29,7 @@ """ Set some Cnchi global constants """ -CNCHI_VERSION = "RebornOS Installer Gnome based 2020.06.15" +CNCHI_VERSION = "RebornOS Installer Gnome based 2020.12.04" CNCHI_WEBSITE = "https://rebornos.org" CNCHI_RELEASE_STAGE = "production" diff --git a/Cnchi/os-release b/Cnchi/os-release new file mode 100644 index 0000000..fd8c06d --- /dev/null +++ b/Cnchi/os-release @@ -0,0 +1,12 @@ +NAME="RebornOS" +VERSION="RebornOS Rolling" +ID=RebornOS +ID_LIKE=arch +PRETTY_NAME="RebornOS" +BUILD_ID=rolling +ANSI_COLOR="38;2;23;147;209" +HOME_URL="https://rebornos.org/" +DOCUMENTATION_URL="https://osdn.net/projects/rebornos/wiki/TitleIndex/" +SUPPORT_URL="https://rebornos.freeforums.net/" +BUG_REPORT_URL="https://gitlab.com/reborn-os-team" +LOGO=rebornos diff --git a/Cnchi/packages.xml b/Cnchi/packages.xml index bfa1f59..23f1028 100755 --- a/Cnchi/packages.xml +++ b/Cnchi/packages.xml @@ -39,6 +39,10 @@ rebornos-cosmic-gnome network-manager-applet + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -121,6 +125,10 @@ rebornos-cosmic-kde + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -129,6 +137,10 @@ rebornos-cosmic-lxqt + lightdm + lightdm-gtk-greeter + rebornos-lightdm-gtk-greeter-images + lightdm-gtk-greeter-settings @@ -435,7 +447,7 @@ bleachbit timeshift - xapps + xapp stacer @@ -453,7 +465,7 @@ redshift - redshiftgui + redshiftgui-bin skypeforlinux-stable-bin @@ -523,6 +535,7 @@ linux-lts + linux-lts-headers freeoffice @@ -591,13 +604,13 @@ wps-office wps-office-mime wps-office-fonts - wps-office-mui-es-es - wps-office-extension-spanish-dictionary - wps-office-mui-pt-br - wps-office-extension-portuguese-brazilian-dictionary - wps-office-mui-ru-ru - wps-office-extension-russian-dictionary - wps-office-extension-english-uk-dictionary + + + + + + + tlp @@ -660,11 +673,12 @@ - grub-zfs - spl - spl-utils - zfs - zfs-utils + + + + + + @@ -687,7 +701,7 @@ efibootmgr - refind-efi + refind diff --git a/Cnchi/postinstall.sh b/Cnchi/postinstall.sh index 4f1a4b4..90d88de 100755 --- 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 diff --git a/Cnchi/rebornos.png b/Cnchi/rebornos.png new file mode 100644 index 0000000..181725b Binary files /dev/null and b/Cnchi/rebornos.png differ diff --git a/Cnchi/rebornos.svg b/Cnchi/rebornos.svg new file mode 100644 index 0000000..1b2a528 --- /dev/null +++ b/Cnchi/rebornos.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/Cnchi/select_packages.py b/Cnchi/select_packages.py index 088be45..e770f59 100755 --- a/Cnchi/select_packages.py +++ b/Cnchi/select_packages.py @@ -55,7 +55,7 @@ except NameError as err: class SelectPackages(): """ Package list creation class """ - PKGLIST_URL = 'https://gitlab.com/reborn-os-team/cnchi/blob/master/Cnchi/packages.xml' + PKGLIST_URL = 'https://gitlab.com/rebornos-team/rebornos-cnchi/cnchi-gnome-based/-/blob/master/Cnchi/packages.xml' def __init__(self, settings, callback_queue): """ Initialize package class """ diff --git a/airootfs/etc/os-release b/airootfs/etc/os-release index b81c909..c98acae 100644 --- a/airootfs/etc/os-release +++ b/airootfs/etc/os-release @@ -1,5 +1,5 @@ NAME="RebornOS" -VERSION="Gnome RebornOS" +VERSION="RebornOS Rolling" ID=RebornOS ID_LIKE=arch PRETTY_NAME="RebornOS" @@ -7,3 +7,4 @@ ANSI_COLOR="1;34;40" HOME_URL="https://rebornos.org/" SUPPORT_URL="https://rebornos.freeforums.net/" BUG_REPORT_URL="https://gitlab.com/reborn-os-team" +LOGO=rebornos diff --git a/airootfs/usr/share/pixmaps/cnchi.png b/airootfs/usr/share/pixmaps/cnchi.png index d7990c4..181725b 100644 Binary files a/airootfs/usr/share/pixmaps/cnchi.png and b/airootfs/usr/share/pixmaps/cnchi.png differ diff --git a/build.sh b/build.sh index 165973f..c7991b6 100755 --- a/build.sh +++ b/build.sh @@ -460,6 +460,10 @@ cp ${script_path}/Cnchi/rebornos-icon.png ${work_dir}/${arch}/airootfs/usr/share # ===>>> Files to configure lightdm with RebornOS and lightdm-gtk-greeter <<<=== # cp ${script_path}/Cnchi/lightdm.conf ${work_dir}/${arch}/airootfs/usr/share/cnchi/ cp ${script_path}/Cnchi/lightdm-gtk-greeter.conf ${work_dir}/${arch}/airootfs/usr/share/cnchi/ +# To be used by os-release in its LOGO = braces line +cp ${script_path}/Cnchi/rebornos.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/ +cp ${script_path}/Cnchi/rebornos.svg ${work_dir}/${arch}/airootfs/usr/share/cnchi/ +cp ${script_path}/Cnchi/os-release ${work_dir}/${arch}/airootfs/usr/share/cnchi/ echo "DONE" echo echo "Replacing Antergos mentions with RebornOS" diff --git a/cnchi-screenshot-0009.png b/cnchi-screenshot-0009.png deleted file mode 100644 index b6448fd..0000000 Binary files a/cnchi-screenshot-0009.png and /dev/null differ diff --git a/cnchi-screenshot-0011.png b/cnchi-screenshot-0011.png new file mode 100644 index 0000000..94c4418 Binary files /dev/null and b/cnchi-screenshot-0011.png differ diff --git a/gsettings/101_reborn_budgie.gschema.override b/gsettings/101_reborn_budgie.gschema.override index 4cc7c8d..19e49a9 100755 --- a/gsettings/101_reborn_budgie.gschema.override +++ b/gsettings/101_reborn_budgie.gschema.override @@ -6,7 +6,7 @@ gtk-theme='Yaru' icon-theme='Papirus' [org.gnome.shell.extensions.user-theme] -name='Yaru' +name='Yaru-dark' [org.gnome.desktop.peripherals.touchpad] natural-scroll=true @@ -40,8 +40,8 @@ allow-updates = false show-ratings = true [org.gnome.shell] -enabled-extensions=['dash-to-panel@jderose9.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'appindicatorsupport@rgcjonas.gmail.com', 'screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com', 'user-theme@gnome-shell-extensions.gcampax.github.com'] -favorite-apps=['org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'firefox.desktop', 'org.gnome.Software.desktop', 'gparted.desktop', 'antergos-install.desktop', 'org.gnome.Terminal.desktop', 'pamac.desktop'] +enabled-extensions=['dash-to-panel@jderose9.github.com', 'drive-menu@gnome-shell-extensions.gcampax.github.com', 'appindicatorsupport@rgcjonas.gmail.com', 'screenshot-window-sizer@gnome-shell-extensions.gcampax.github.com', 'user-theme@gnome-shell-extensions.gcampax.github.com'] +favorite-apps=['firefox.desktop', 'org.gnome.Nautilus.desktop', 'org.gnome.gedit.desktop', 'gparted.desktop', 'antergos-install.desktop', 'org.gnome.Terminal.desktop'] always-show-log-out=true [org.gnome.settings-daemon.plugins.xsettings] diff --git a/packages.both b/packages.both index ccf37f7..2533990 100755 --- a/packages.both +++ b/packages.both @@ -33,14 +33,18 @@ partclone partimage ppp pptpclient -refind-efi +# refind-efi not available (change to refind): +# refind-efi +refind rp-pppoe sdparm sg3_utils smartmontools tcpdump testdisk -vim-minimal +# vim-minimal not available (change to vim): +# vim-minimal +vim vpnc wvdial xl2tpd @@ -50,10 +54,7 @@ yay base base-devel -# ===>>> Comsic packages <<<=== # -# common-cosmic-reborn -# full-base-cosmic-reborn -# graphic-cosmic-reborn +# ===>>> Cosmic packages <<<=== # rebornos-cosmic-common rebornos-cosmic-full-base rebornos-cosmic-graphic @@ -61,7 +62,6 @@ rebornos-cosmic-graphic # ===>>> GNOME install start here <<<=== # gnome -# gnome-cosmic-reborn rebornos-cosmic-gnome gdm network-manager-applet @@ -78,6 +78,7 @@ yaru-icon-theme yaru-sound-theme # For accessibility in conjunction with ORCA it is added: espeak-ng +rebornos-logo # ===>>> VirtualBox <<<=== # @@ -85,7 +86,8 @@ espeak-ng # virtualbox-guest-modules-arch --> It is no longer in the repository. Now present in the kernel. # virtualbox-guest-utils xf86-input-libinput -#xf86-input-mouse +# xf86-input-mouse has been removed from the repositories: +# xf86-input-mouse xf86-video-amdgpu xf86-video-ati xf86-video-intel @@ -182,7 +184,9 @@ git # ===>>> Network packages <<<=== # b43-firmware broadcom-wl-dkms -dnsutils +# dnsutils change to bind: +# dnsutils +bind netctl nss-mdns @@ -196,6 +200,7 @@ nvidia-settings # ===>>> Necessary for Cnchi. Enter Cnchi bloat! <<<=== # encfs +# In RebornOS repo (pam_encfs): pam_encfs libinput clutter