From 265f80d955a5f09e115748bc96ed83d18cc84f46 Mon Sep 17 00:00:00 2001 From: Rafael Costa Rega Date: Sun, 10 May 2020 08:28:08 -0300 Subject: [PATCH] 2020.05.10 update --- CHANGELOG | 21 ++++++++ Cnchi/101_gnome.gschema.override | 41 +++++++++++++++ Cnchi/95_cinnamon.gschema.override | 11 ++++ Cnchi/desktop_info.py | 4 +- Cnchi/features_info.py | 15 +++--- Cnchi/gufw.desktop | 105 ++++++++++++++++++++++++++++++++++--- Cnchi/info.py | 2 +- Cnchi/packages.xml | 20 ++----- Cnchi/postinstall.sh | 11 +++- Cnchi/reborn-mirrorlist | 7 +-- Cnchi/reborn-mirrorlist2 | 9 ++-- airootfs/etc/reborn-mirrorlist | 7 +-- build.sh | 5 ++ config | 3 +- packages.both | 30 +++++++---- 15 files changed, 232 insertions(+), 59 deletions(-) create mode 100644 Cnchi/101_gnome.gschema.override create mode 100644 Cnchi/95_cinnamon.gschema.override diff --git a/CHANGELOG b/CHANGELOG index 91c33f1..3fcc5bd 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -49,4 +49,25 @@ Change to a new location/subgroup: https://gitlab.com/reborn-os-team/rebornos-cnchi/cnchi-gnome-based +========================================================================= + +2020.05.07 + +Installation options (file selection) exist in: + +desktop_info.py +feature_info.py + + +Nixnote2 (abandoned maintenance, and malfunctioning) was changed to qownnotes + + +Fixed Uncomplicated Firewall (gufw) shortcut to display properly on different desktops + + +File /etc/pacman.d/reborn-mirrorlist change: + +chmod 644 /etc/pacman.d/reborn-mirrorlist + + diff --git a/Cnchi/101_gnome.gschema.override b/Cnchi/101_gnome.gschema.override new file mode 100644 index 0000000..d2072c4 --- /dev/null +++ b/Cnchi/101_gnome.gschema.override @@ -0,0 +1,41 @@ +[org.gnome.desktop.interface] +clock-format='24h' +clock-show-date=true +clock-show-seconds=false +gtk-theme='Yaru' +icon-theme='Papirus' + +[org.gnome.shell.extensions.user-theme] +name='Yaru' + +[org.gnome.desktop.peripherals.touchpad] +natural-scroll=true +tap-to-click=true + +[org.gnome.desktop.datetime] +automatic-timezone=true + +[org.gnome.desktop.wm.preferences] +button-layout='appmenu:minimize,maximize,close' +theme='Yaru' + +[org.gnome.nautilus.preferences] +show-create-link=true + +[org.gnome.desktop.background] +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'] +always-show-log-out=true + +[org.gnome.settings-daemon.plugins.xsettings] +antialiasing='rgba' + +[org.gnome.mutter] +center-new-windows = true +dynamic-workspaces = true + +[org.gnome.shell.extensions.activities-config] +activities-config-button-no-text=true + diff --git a/Cnchi/95_cinnamon.gschema.override b/Cnchi/95_cinnamon.gschema.override new file mode 100644 index 0000000..ce9b699 --- /dev/null +++ b/Cnchi/95_cinnamon.gschema.override @@ -0,0 +1,11 @@ +[org.cinnamon.desktop.interface] +keyboard-layout-show-flags=true +gtk-theme = 'Mint-Y' +icon-theme = 'Mint-Y' +cursor-theme = 'Adwaita' +clock-use-24h=true +clock-show-date=false + +[org.cinnamon.desktop.wm.preferences] +theme = 'Mint-Y' + diff --git a/Cnchi/desktop_info.py b/Cnchi/desktop_info.py index 54f7055..4189e60 100644 --- a/Cnchi/desktop_info.py +++ b/Cnchi/desktop_info.py @@ -73,11 +73,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", "nixnote", "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", "mycroft", "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", "nixnote", "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", "mycroft", "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 13e904d..0fb8bfb 100755 --- a/Cnchi/features_info.py +++ b/Cnchi/features_info.py @@ -62,7 +62,7 @@ ICON_NAMES = { 'lts': 'applications-accessories', 'nemo': 'system-file-manager', 'nautilus': 'system-file-manager', - 'nixnote': 'evernote', + 'qownnotes': 'QOwnNotes', 'wps-office': 'wps-office-wpt', 'libreoffice': 'libreoffice-writer', 'freeoffice': 'libreoffice-writer', @@ -83,7 +83,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', 'nixnote', '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', 'mycroft', '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): @@ -132,7 +132,7 @@ TITLES = { 'wallpapers': _("Wallpapers Cycler"), 'wine': _("Run Windows Programs on Linux"), 'nemo': _("Nemo File Manager"), - 'nixnote': _("Evernote For Linux"), + 'qownnotes': _("QOwnNotes"), 'nautilus': _("Nautilus File Manager")} DESCRIPTIONS = { @@ -178,7 +178,7 @@ DESCRIPTIONS = { 'nemo': _("Default file manager for the Cinnamon desktop."), 'wallpapers': _("Wallpapers Cycler That Changes Wallpapers Every Day"), 'wine': _("Run Common Windows Programs on Linux Easily"), - 'nixnote': _("An Opensource implementation of Evernote for Linux"), + 'qownnotes': _("Your notes on your hard disk and in your own cloud"), 'nautilus': _("Default file manager for the Gnome desktop.")} TOOLTIPS = { @@ -337,9 +337,10 @@ TOOLTIPS = { "That said, Nemo is the default file manager for the Cinnamon desktop.\n" "It is praised for it's features, but does not compare to Konquerer,\n" "the KDE file manager."), - 'nixnote': _("Nixnote, (formerly Nevernote) is an opensource client for Evernote,\n" - "allowing you to track your digital life in a single, convenient place.\n" - "NOTE: an Evernote account is required for cloud synchronization."), + 'qownnotes': _("QOwnNotes is the open source (GPL) plain-text file markdown note\n" + "taking application for GNU/Linux, Mac OS X and Windows by Patrizio\n" + "Bekerle (pbek on GitHub and IRC), that (optionally) works together\n" + "with the notes application of ownCloud or Nextcloud."), 'wallpapers': _("Installs a program known as Variety, an easy way to automatically\n" "change your wallpaper from thousands of high-quality, free images each day."), 'wine': _("Easily run several Windows programs on Linux - safely. Wine offers a simple,\n" diff --git a/Cnchi/gufw.desktop b/Cnchi/gufw.desktop index cb3743e..eefbedc 100644 --- a/Cnchi/gufw.desktop +++ b/Cnchi/gufw.desktop @@ -1,12 +1,101 @@ [Desktop Entry] Version=1.0 -Type=Application -Name=Uncomplicated Firewall -Comment=Is a program for managing a netfilter firewall. -Icon=/usr/share/icons/default/gufw.svg +Name=Firewall Configuration +Name[ar]=إعدادات الجدار الناري +Name[ast]=Configuración del tornafueos +Name[bg]=Конфигуриране на защитна стена +Name[ca]=Configuració del tallafoc +Name[cs]=Nastavení firewallu +Name[da]=Firewallkonfiguration +Name[de]=Firewall-Konfiguration +Name[el]=Ρύθμιση τείχους προστασίας +Name[en_AU]=Firewall Configuration +Name[en_GB]=Firewall Configuration +Name[eo]=Fajroŝirmilaj agordoj +Name[es]=Configuración del cortafuegos +Name[et]=Tulemüüri seadistus +Name[fi]=Palomuurin asetukset +Name[fr]=Configuration du pare-feu +Name[gl]=Configuración da devasa +Name[hr]=Postavke vatrozida +Name[hrx]=Fajř-vannt-ʃtelluŋŋ +Name[hu]=Tűzfalbeállítás +Name[id]=Konfigurasi firewall +Name[is]=Stillingar eldveggs +Name[it]=Configurazione del firewall +Name[ja]=ファイアウォール設定ツール +Name[ko]=방화벽 설정 +Name[ku]=Veavakirina Dîwarê Ewlehiyê +Name[lt]=Užkardos konfigūravimas +Name[lv]=Ugunsmūra konfigurācija +Name[ms]=Konfigurasi Dinding Api +Name[nb]=Brannmur-oppsett +Name[nl]=Firewall-configuratie +Name[oc]=Configuracion del parafuòc +Name[pl]=Konfiguracja zapory sieciowej +Name[pt]=Configuração da firewall +Name[pt_BR]=Configuração do Firewall +Name[ro]=Configurare Firewall +Name[ru]=Настройка межсетевого экрана +Name[si]=ගිනිපවුරු සැකසුම් +Name[sk]=Nastavenia brány firewall +Name[sl]=Nastavitev požarnega zidu +Name[sq]=Konfigurimi i Murit mbrojtës +Name[sr]=Подешавање мрежне баријере +Name[sv]=Brandväggs-konfiguration +Name[ta]=தீச்சுவர் அமைப்பு +Name[tr]=Güvenlik Duvarı Yapılandırması +Name[ug]=تور توسۇق سەپلەش +Name[uk]=Налаштування брандмауера +Name[vi]=Cấu hình tường lửa +Name[zh_CN]=防火墙配置 +Name[zh_TW]=防火牆設定 +Comment=An easy way to configure your firewall +Comment[ast]=Un mou cenciellu de configurar el to tornafueos +Comment[bg]=Най-лесният начин да конфигурирате вашата защитна стена +Comment[ca]=Una forma senzilla per configurar el vostre tallafoc +Comment[cs]=Jednoduchá konfigurace firewallu +Comment[da]=En nem måde at konfigurere din firewall på +Comment[de]=Eine einfache Möglichkeit Ihre Firewall zu konfigurieren +Comment[en_GB]=An easy way to configure your firewall +Comment[es]=Una manera sencilla de configurar su cortafuegos +Comment[et]=Lihtne moodus seadistamaks tulemüüri +Comment[fi]=Hallitse palomuuria vaivatta +Comment[fr]=Une façon simple de configurer votre pare-feu +Comment[gl]=Unha forma doada de configurar a devasa +Comment[hr]=Jednostavan način za podešavanje vašeg vatrozida +Comment[hu]=Egyszerű módszer a tűzfala beállítására +Comment[is]=Einföld leið til að stilla eldvegginn þinn +Comment[it]=Un modo semplice per configurare il firewall +Comment[ja]=ファイアウォールの設定を簡単に行えます +Comment[ko]=당신의 방화벽을 쉽게 설정하는 방법입니다 +Comment[ku]=Rêyek hêsanî jibo veavakirina dîwarê te +Comment[lt]=Lengvas būdas konfigūruoti užkardą +Comment[ms]=Merupakan cara mudah mengkonfigur dinding api anda +Comment[nb]=En enkel måte å sette opp brannmur på +Comment[nl]=Een eenvoudige manier om uw firewall in te stellen +Comment[oc]=Un biais simple de configurar vòstre parafuòc +Comment[pl]=Prosty sposób na skonfigurowanie zapory sieciowej +Comment[pt]=Uma forma fácil de configurar a sua firewall +Comment[pt_BR]=Um jeito fácil de configurar seu firewall +Comment[ro]=O cale mai ușoară pentru configurarea firewall-ului +Comment[ru]=Простой способ настроить ваш межсетевой экран +Comment[si]=ඔබේ ගිනිපවුර වෙනස්කිරීමට පහසු මගක් +Comment[sk]=Jednoduchý spôsob nastavenia vašej brány firewall +Comment[sl]=Enostaven način nastavitve vašega požarnega zidu +Comment[sr]=Лак начин за подешавање мрежне баријере +Comment[sv]=Ett lätt sätt att konfigurera din brandvägg +Comment[tr]=Güvenlik duvarınızı yapılandırmanın kolay bir yolu +Comment[uk]=Простий спосіб налаштувати ваш брандмауер +Comment[vi]=Một cách dễ dàng để cấu hình tường lửa của bạn +Comment[zh_CN]=配置防火墙的简单方法 +Comment[zh_TW]=簡單設定您的防火牆 +Keywords=gufw;security;firewall;network; +Categories=GNOME;GTK;Settings;Security;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings; Exec=gufw -NoDisplay=false -Categories=Utility; -Keywords=firewall -StartupNotify=true +Icon=gufw Terminal=false +Type=Application +X-GNOME-Settings-Panel=gufw +X-Unity-Settings-Panel=gufw +X-Ubuntu-Gettext-Domain=gufw diff --git a/Cnchi/info.py b/Cnchi/info.py index 31919d8..02f5155 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.02" +CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.09" CNCHI_WEBSITE = "https://rebornos.org" CNCHI_RELEASE_STAGE = "production" diff --git a/Cnchi/packages.xml b/Cnchi/packages.xml index 5d947cf..1f8b25c 100755 --- a/Cnchi/packages.xml +++ b/Cnchi/packages.xml @@ -7,7 +7,6 @@ full-base-cosmic-reborn base base-devel - rebornos-keyring @@ -203,24 +202,11 @@ broadcom-wl - cups - cups-pk-helper - gutenprint - foomatic-db - foomatic-db-engine - foomatic-db-nonfree - foomatic-db-gutenprint-ppds - foomatic-db-ppds - foomatic-db-nonfree-ppds - splix - gsfonts - hplip + cups-cosmic-reborn print-manager system-config-printer - python-pyqt5 - python-gobject chromium @@ -619,8 +605,8 @@ nautilus - - nixnote2 + + qownnotes vlc diff --git a/Cnchi/postinstall.sh b/Cnchi/postinstall.sh index db50504..63abc87 100755 --- 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 diff --git a/Cnchi/reborn-mirrorlist b/Cnchi/reborn-mirrorlist index d23e920..0abcae0 100644 --- a/Cnchi/reborn-mirrorlist +++ b/Cnchi/reborn-mirrorlist @@ -1,9 +1,10 @@ -################################################################################ -#################### Reborn OS mirrorlist generated by hand #################### -################################################################################ +######################################################################### +# RebornOS Mirrorlist generated by Cnchi RebornOS Installer Gnome based # +######################################################################### # US Server Server = https://repo.rebornos.org/RebornOS/ # European Server Server = http://repo-de.rebornos.org/Reborn-OS/ + diff --git a/Cnchi/reborn-mirrorlist2 b/Cnchi/reborn-mirrorlist2 index 5c1035f..0abcae0 100644 --- a/Cnchi/reborn-mirrorlist2 +++ b/Cnchi/reborn-mirrorlist2 @@ -1,9 +1,10 @@ -################################################################################ -#################### Reborn OS mirrorlist generated by hand #################### -################################################################################ +######################################################################### +# RebornOS Mirrorlist generated by Cnchi RebornOS Installer Gnome based # +######################################################################### # US Server Server = https://repo.rebornos.org/RebornOS/ # European Server -#Server = https://repo.itmettke.de/Reborn-OS/ +Server = http://repo-de.rebornos.org/Reborn-OS/ + diff --git a/airootfs/etc/reborn-mirrorlist b/airootfs/etc/reborn-mirrorlist index 82d5b04..0abcae0 100644 --- a/airootfs/etc/reborn-mirrorlist +++ b/airootfs/etc/reborn-mirrorlist @@ -1,9 +1,10 @@ -################################################################################ -#################### Reborn OS mirrorlist generated by cnchi ################### -################################################################################ +######################################################################### +# RebornOS Mirrorlist generated by Cnchi RebornOS Installer Gnome based # +######################################################################### # US Server Server = https://repo.rebornos.org/RebornOS/ # European Server Server = http://repo-de.rebornos.org/Reborn-OS/ + diff --git a/build.sh b/build.sh index 8939cd8..9561714 100755 --- a/build.sh +++ b/build.sh @@ -364,6 +364,7 @@ cp ${script_path}/Cnchi/pacman.conf ${work_dir}/${arch}/airootfs/usr/share/cnchi rm ${work_dir}/${arch}/airootfs/etc/pacman.conf cp ${script_path}/Cnchi/pacman.conf ${work_dir}/${arch}/airootfs/etc/ chmod 644 /etc/pacman.conf +chmod 644 /etc/pacman.d/reborn-mirrorlist rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/pacman.tmpl cp ${script_path}/Cnchi/pacman.tmpl ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/ rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/info.py @@ -431,6 +432,10 @@ cp ${script_path}/Cnchi/10_antergos ${work_dir}/${arch}/airootfs/usr/share/cnchi cp ${script_path}/Cnchi/gufw.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/ cp ${script_path}/Cnchi/gufw.svg ${work_dir}/${arch}/airootfs/usr/share/cnchi/ cp ${script_path}/Cnchi/gufw.desktop ${work_dir}/${arch}/airootfs/usr/share/cnchi/ +# Cinnamon gschema +cp ${script_path}/Cnchi/95_cinnamon.gschema.override ${work_dir}/${arch}/airootfs/usr/share/cnchi/ +# Gnome gschema +cp ${script_path}/Cnchi/101_gnome.gschema.override ${work_dir}/${arch}/airootfs/usr/share/cnchi/ echo "DONE" echo echo "Replacing Antergos mentions with RebornOS" diff --git a/config b/config index a4f8f19..5f1811a 100644 --- a/config +++ b/config @@ -9,4 +9,5 @@ CNCHI_REBORNOS_URL="https://repo.rebornos.org/RebornOS/sources/cnchi/0.16.21.zip # iso-hotfix-utility ISO_HOTFIX_UTILITY_VERSION="1.0.17" -ISO_HOTFIX_UTILITY_URL="https://github.com/Antergos/iso-hotfix-utility/archive/${ISO_HOTFIX_UTILITY_VERSION}.tar.gz" +# ISO_HOTFIX_UTILITY_URL="https://github.com/Antergos/iso-hotfix-utility/archive/${ISO_HOTFIX_UTILITY_VERSION}.tar.gz" +ISO_HOTFIX_UTILITY_URL="https://repo.rebornos.org/RebornOS/sources/cnchi/${ISO_HOTFIX_UTILITY_VERSION}.tar.gz" diff --git a/packages.both b/packages.both index f86b7f4..107c748 100755 --- a/packages.both +++ b/packages.both @@ -81,6 +81,25 @@ yaru-gtk-theme yaru-icon-theme yaru-sound-theme + +# VirtualBox +#Virtualbox and xf86 packages? Whose bright idea was it to combine these? Oh wait... probably mine at one point +# 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-video-amdgpu +xf86-video-ati +xf86-video-intel +xf86-video-dummy +xorg-apps +xorg-fonts + + +# VMWare +xf86-video-vmware + + # Scripts to aid in installing Arch Linux arch-install-scripts @@ -169,17 +188,6 @@ dnsutils netctl nss-mdns -#Virtualbox and xf86 packages? Whose bright idea was it to combine these? Oh wait... probably mine at one point -# 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-video-amdgpu -xf86-video-ati -xf86-video-intel -xf86-video-dummy -xorg-apps -xorg-fonts # Now why does this guy get his own group? xf86-video-nouveau -- 2.11.0