• R/O
  • HTTP
  • SSH
  • HTTPS

cnchi-gnome-osdn: Commit

RebornOS cnchi Gnome based install code


Commit MetaInfo

Revision265f80d955a5f09e115748bc96ed83d18cc84f46 (tree)
Time2020-05-10 20:28:08
AuthorRafael Costa Rega <rcostarega@gmai...>
CommiterRafael Costa Rega

Log Message

2020.05.10 update

Change Summary

Incremental Difference

--- a/CHANGELOG
+++ b/CHANGELOG
@@ -49,4 +49,25 @@ Change to a new location/subgroup:
4949
5050 https://gitlab.com/reborn-os-team/rebornos-cnchi/cnchi-gnome-based
5151
52+=========================================================================
53+
54+2020.05.07
55+
56+Installation options (file selection) exist in:
57+
58+desktop_info.py
59+feature_info.py
60+
61+
62+Nixnote2 (abandoned maintenance, and malfunctioning) was changed to qownnotes
63+
64+
65+Fixed Uncomplicated Firewall (gufw) shortcut to display properly on different desktops
66+
67+
68+File /etc/pacman.d/reborn-mirrorlist change:
69+
70+chmod 644 /etc/pacman.d/reborn-mirrorlist
71+
72+
5273
--- /dev/null
+++ b/Cnchi/101_gnome.gschema.override
@@ -0,0 +1,41 @@
1+[org.gnome.desktop.interface]
2+clock-format='24h'
3+clock-show-date=true
4+clock-show-seconds=false
5+gtk-theme='Yaru'
6+icon-theme='Papirus'
7+
8+[org.gnome.shell.extensions.user-theme]
9+name='Yaru'
10+
11+[org.gnome.desktop.peripherals.touchpad]
12+natural-scroll=true
13+tap-to-click=true
14+
15+[org.gnome.desktop.datetime]
16+automatic-timezone=true
17+
18+[org.gnome.desktop.wm.preferences]
19+button-layout='appmenu:minimize,maximize,close'
20+theme='Yaru'
21+
22+[org.gnome.nautilus.preferences]
23+show-create-link=true
24+
25+[org.gnome.desktop.background]
26+picture-uri='file:///usr/share/backgrounds/gnome/adwaita-day.jpg'
27+
28+[org.gnome.shell]
29+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']
30+always-show-log-out=true
31+
32+[org.gnome.settings-daemon.plugins.xsettings]
33+antialiasing='rgba'
34+
35+[org.gnome.mutter]
36+center-new-windows = true
37+dynamic-workspaces = true
38+
39+[org.gnome.shell.extensions.activities-config]
40+activities-config-button-no-text=true
41+
--- /dev/null
+++ b/Cnchi/95_cinnamon.gschema.override
@@ -0,0 +1,11 @@
1+[org.cinnamon.desktop.interface]
2+keyboard-layout-show-flags=true
3+gtk-theme = 'Mint-Y'
4+icon-theme = 'Mint-Y'
5+cursor-theme = 'Adwaita'
6+clock-use-24h=true
7+clock-show-date=false
8+
9+[org.cinnamon.desktop.wm.preferences]
10+theme = 'Mint-Y'
11+
--- a/Cnchi/desktop_info.py
+++ b/Cnchi/desktop_info.py
@@ -73,11 +73,11 @@ LIBS = {
7373 'qt': ["kde", "lxqt"]
7474 }
7575
76-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"]
76+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"]
7777
7878 # Not all desktops have all features
7979 EXCLUDED_FEATURES = {
80- '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"],
80+ '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"],
8181 'apricity': ["lamp", "visual", "nautilus", "qt-play"],
8282 'cinnamon': ["lamp", "visual", "nemo", "qt-play"],
8383 'deepin': ["lamp", "visual", "qt-play"],
--- a/Cnchi/features_info.py
+++ b/Cnchi/features_info.py
@@ -62,7 +62,7 @@ ICON_NAMES = {
6262 'lts': 'applications-accessories',
6363 'nemo': 'system-file-manager',
6464 'nautilus': 'system-file-manager',
65- 'nixnote': 'evernote',
65+ 'qownnotes': 'QOwnNotes',
6666 'wps-office': 'wps-office-wpt',
6767 'libreoffice': 'libreoffice-writer',
6868 'freeoffice': 'libreoffice-writer',
@@ -83,7 +83,7 @@ ICON_NAMES = {
8383 ADVANCED = [ 'lamp', 'sshd', 'visual', 'firewire', 'broadcom', 'nautilus', 'nemo', 'email', 'wallpapers', 'hunspell' ]
8484
8585 # These features are considered 'basic', and will be shown by default
86-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']
86+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']
8787
8888 # See http://docs.python.org/2/library/gettext.html "22.1.3.4. Deferred translations"
8989 def _(message):
@@ -132,7 +132,7 @@ TITLES = {
132132 'wallpapers': _("Wallpapers Cycler"),
133133 'wine': _("Run Windows Programs on Linux"),
134134 'nemo': _("Nemo File Manager"),
135- 'nixnote': _("Evernote For Linux"),
135+ 'qownnotes': _("QOwnNotes"),
136136 'nautilus': _("Nautilus File Manager")}
137137
138138 DESCRIPTIONS = {
@@ -178,7 +178,7 @@ DESCRIPTIONS = {
178178 'nemo': _("Default file manager for the Cinnamon desktop."),
179179 'wallpapers': _("Wallpapers Cycler That Changes Wallpapers Every Day"),
180180 'wine': _("Run Common Windows Programs on Linux Easily"),
181- 'nixnote': _("An Opensource implementation of Evernote for Linux"),
181+ 'qownnotes': _("Your notes on your hard disk and in your own cloud"),
182182 'nautilus': _("Default file manager for the Gnome desktop.")}
183183
184184 TOOLTIPS = {
@@ -337,9 +337,10 @@ TOOLTIPS = {
337337 "That said, Nemo is the default file manager for the Cinnamon desktop.\n"
338338 "It is praised for it's features, but does not compare to Konquerer,\n"
339339 "the KDE file manager."),
340- 'nixnote': _("Nixnote, (formerly Nevernote) is an opensource client for Evernote,\n"
341- "allowing you to track your digital life in a single, convenient place.\n"
342- "NOTE: an Evernote account is required for cloud synchronization."),
340+ 'qownnotes': _("QOwnNotes is the open source (GPL) plain-text file markdown note\n"
341+ "taking application for GNU/Linux, Mac OS X and Windows by Patrizio\n"
342+ "Bekerle (pbek on GitHub and IRC), that (optionally) works together\n"
343+ "with the notes application of ownCloud or Nextcloud."),
343344 'wallpapers': _("Installs a program known as Variety, an easy way to automatically\n"
344345 "change your wallpaper from thousands of high-quality, free images each day."),
345346 'wine': _("Easily run several Windows programs on Linux - safely. Wine offers a simple,\n"
--- a/Cnchi/gufw.desktop
+++ b/Cnchi/gufw.desktop
@@ -1,12 +1,101 @@
11 [Desktop Entry]
22 Version=1.0
3-Type=Application
4-Name=Uncomplicated Firewall
5-Comment=Is a program for managing a netfilter firewall.
6-Icon=/usr/share/icons/default/gufw.svg
3+Name=Firewall Configuration
4+Name[ar]=إعدادات الجدار الناري
5+Name[ast]=Configuración del tornafueos
6+Name[bg]=Конфигуриране на защитна стена
7+Name[ca]=Configuració del tallafoc
8+Name[cs]=Nastavení firewallu
9+Name[da]=Firewallkonfiguration
10+Name[de]=Firewall-Konfiguration
11+Name[el]=Ρύθμιση τείχους προστασίας
12+Name[en_AU]=Firewall Configuration
13+Name[en_GB]=Firewall Configuration
14+Name[eo]=Fajroŝirmilaj agordoj
15+Name[es]=Configuración del cortafuegos
16+Name[et]=Tulemüüri seadistus
17+Name[fi]=Palomuurin asetukset
18+Name[fr]=Configuration du pare-feu
19+Name[gl]=Configuración da devasa
20+Name[hr]=Postavke vatrozida
21+Name[hrx]=Fajř-vannt-ʃtelluŋŋ
22+Name[hu]=Tűzfalbeállítás
23+Name[id]=Konfigurasi firewall
24+Name[is]=Stillingar eldveggs
25+Name[it]=Configurazione del firewall
26+Name[ja]=ファイアウォール設定ツール
27+Name[ko]=방화벽 설정
28+Name[ku]=Veavakirina Dîwarê Ewlehiyê
29+Name[lt]=Užkardos konfigūravimas
30+Name[lv]=Ugunsmūra konfigurācija
31+Name[ms]=Konfigurasi Dinding Api
32+Name[nb]=Brannmur-oppsett
33+Name[nl]=Firewall-configuratie
34+Name[oc]=Configuracion del parafuòc
35+Name[pl]=Konfiguracja zapory sieciowej
36+Name[pt]=Configuração da firewall
37+Name[pt_BR]=Configuração do Firewall
38+Name[ro]=Configurare Firewall
39+Name[ru]=Настройка межсетевого экрана
40+Name[si]=ගිනිපවුරු සැකසුම්
41+Name[sk]=Nastavenia brány firewall
42+Name[sl]=Nastavitev požarnega zidu
43+Name[sq]=Konfigurimi i Murit mbrojtës
44+Name[sr]=Подешавање мрежне баријере
45+Name[sv]=Brandväggs-konfiguration
46+Name[ta]=தீச்சுவர் அமைப்பு
47+Name[tr]=Güvenlik Duvarı Yapılandırması
48+Name[ug]=تور توسۇق سەپلەش
49+Name[uk]=Налаштування брандмауера
50+Name[vi]=Cấu hình tường lửa
51+Name[zh_CN]=防火墙配置
52+Name[zh_TW]=防火牆設定
53+Comment=An easy way to configure your firewall
54+Comment[ast]=Un mou cenciellu de configurar el to tornafueos
55+Comment[bg]=Най-лесният начин да конфигурирате вашата защитна стена
56+Comment[ca]=Una forma senzilla per configurar el vostre tallafoc
57+Comment[cs]=Jednoduchá konfigurace firewallu
58+Comment[da]=En nem måde at konfigurere din firewall på
59+Comment[de]=Eine einfache Möglichkeit Ihre Firewall zu konfigurieren
60+Comment[en_GB]=An easy way to configure your firewall
61+Comment[es]=Una manera sencilla de configurar su cortafuegos
62+Comment[et]=Lihtne moodus seadistamaks tulemüüri
63+Comment[fi]=Hallitse palomuuria vaivatta
64+Comment[fr]=Une façon simple de configurer votre pare-feu
65+Comment[gl]=Unha forma doada de configurar a devasa
66+Comment[hr]=Jednostavan način za podešavanje vašeg vatrozida
67+Comment[hu]=Egyszerű módszer a tűzfala beállítására
68+Comment[is]=Einföld leið til að stilla eldvegginn þinn
69+Comment[it]=Un modo semplice per configurare il firewall
70+Comment[ja]=ファイアウォールの設定を簡単に行えます
71+Comment[ko]=당신의 방화벽을 쉽게 설정하는 방법입니다
72+Comment[ku]=Rêyek hêsanî jibo veavakirina dîwarê te
73+Comment[lt]=Lengvas būdas konfigūruoti užkardą
74+Comment[ms]=Merupakan cara mudah mengkonfigur dinding api anda
75+Comment[nb]=En enkel måte å sette opp brannmur på
76+Comment[nl]=Een eenvoudige manier om uw firewall in te stellen
77+Comment[oc]=Un biais simple de configurar vòstre parafuòc
78+Comment[pl]=Prosty sposób na skonfigurowanie zapory sieciowej
79+Comment[pt]=Uma forma fácil de configurar a sua firewall
80+Comment[pt_BR]=Um jeito fácil de configurar seu firewall
81+Comment[ro]=O cale mai ușoară pentru configurarea firewall-ului
82+Comment[ru]=Простой способ настроить ваш межсетевой экран
83+Comment[si]=ඔබේ ගිනිපවුර වෙනස්කිරීමට පහසු මගක්
84+Comment[sk]=Jednoduchý spôsob nastavenia vašej brány firewall
85+Comment[sl]=Enostaven način nastavitve vašega požarnega zidu
86+Comment[sr]=Лак начин за подешавање мрежне баријере
87+Comment[sv]=Ett lätt sätt att konfigurera din brandvägg
88+Comment[tr]=Güvenlik duvarınızı yapılandırmanın kolay bir yolu
89+Comment[uk]=Простий спосіб налаштувати ваш брандмауер
90+Comment[vi]=Một cách dễ dàng để cấu hình tường lửa của bạn
91+Comment[zh_CN]=配置防火墙的简单方法
92+Comment[zh_TW]=簡單設定您的防火牆
93+Keywords=gufw;security;firewall;network;
94+Categories=GNOME;GTK;Settings;Security;X-GNOME-Settings-Panel;X-GNOME-SystemSettings;X-Unity-Settings-Panel;X-XFCE-SettingsDialog;X-XFCE-SystemSettings;
795 Exec=gufw
8-NoDisplay=false
9-Categories=Utility;
10-Keywords=firewall
11-StartupNotify=true
96+Icon=gufw
1297 Terminal=false
98+Type=Application
99+X-GNOME-Settings-Panel=gufw
100+X-Unity-Settings-Panel=gufw
101+X-Ubuntu-Gettext-Domain=gufw
--- a/Cnchi/info.py
+++ b/Cnchi/info.py
@@ -29,7 +29,7 @@
2929
3030 """ Set some Cnchi global constants """
3131
32-CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.02"
32+CNCHI_VERSION = "RebornOS Installer Gnome based 2020.05.09"
3333 CNCHI_WEBSITE = "https://rebornos.org"
3434 CNCHI_RELEASE_STAGE = "production"
3535
--- a/Cnchi/packages.xml
+++ b/Cnchi/packages.xml
@@ -7,7 +7,6 @@
77 <pkgname>full-base-cosmic-reborn</pkgname>
88 <pkgname>base</pkgname>
99 <pkgname>base-devel</pkgname>
10- <pkgname>rebornos-keyring</pkgname>
1110 </packages>
1211 </edition>
1312
@@ -203,24 +202,11 @@
203202 <pkgname>broadcom-wl</pkgname>
204203 </feature>
205204 <feature name="cups">
206- <pkgname>cups</pkgname>
207- <pkgname>cups-pk-helper</pkgname>
208- <pkgname>gutenprint</pkgname>
209- <pkgname>foomatic-db</pkgname>
210- <pkgname>foomatic-db-engine</pkgname>
211- <pkgname>foomatic-db-nonfree</pkgname>
212- <pkgname>foomatic-db-gutenprint-ppds</pkgname>
213- <pkgname>foomatic-db-ppds</pkgname>
214- <pkgname>foomatic-db-nonfree-ppds</pkgname>
215- <pkgname>splix</pkgname>
216- <pkgname>gsfonts</pkgname>
217- <pkgname>hplip</pkgname>
205+ <pkgname>cups-cosmic-reborn</pkgname>
218206 <pkgname lib='qt'>print-manager</pkgname>
219207 <pkgname lib='gtk'>system-config-printer</pkgname>
220208 <!-- <pkgname lib='gtk'>python2-gnomekeyring</pkgname> -->
221209 <!-- These two are required by hp-setup -->
222- <pkgname>python-pyqt5</pkgname>
223- <pkgname>python-gobject</pkgname>
224210 </feature>
225211 <feature name="chromium">
226212 <pkgname>chromium</pkgname>
@@ -619,8 +605,8 @@
619605 <pkgname>nautilus</pkgname>
620606 <!-- <pkgname>nautilus-root</pkgname> -->
621607 </feature>
622- <feature name="nixnote">
623- <pkgname>nixnote2</pkgname>
608+ <feature name="qownnotes">
609+ <pkgname>qownnotes</pkgname>
624610 </feature>
625611 <feature name="vlc">
626612 <pkgname>vlc</pkgname>
--- a/Cnchi/postinstall.sh
+++ b/Cnchi/postinstall.sh
@@ -52,7 +52,7 @@ set_xscreensaver() {
5252 set_gsettings() {
5353 # Set gsettings input-source
5454 CN_KEYBOARD=""
55- CN_INPUT_SCHEMA="${CN_DESTDIR}/usr/share/glib-2.0/schemas/90_antergos.input-sources.gschema.override"
55+ CN_INPUT_SCHEMA="${CN_DESTDIR}/usr/share/glib-2.0/schemas/90_rebornos.input-sources.gschema.override"
5656 if [[ "${CN_KEYBOARD_LAYOUT}" != '' ]]; then
5757 if [[ "${CN_KEYBOARD_VARIANT}" != '' ]]; then
5858 CN_KEYBOARD=${CN_KEYBOARD_LAYOUT}+${CN_KEYBOARD_VARIANT}
@@ -67,7 +67,7 @@ set_gsettings() {
6767 fi
6868
6969 # Set default Internet browser
70- for CN_SCHEMA_OVERRIDE in ${CN_DESTDIR}/usr/share/glib-2.0/schemas/90_antergos*; do
70+ for CN_SCHEMA_OVERRIDE in ${CN_DESTDIR}/usr/share/glib-2.0/schemas/90_rebornos*; do
7171 if [ "${CN_BROWSER}" != "" ]; then
7272 sed -i "s|chromium|${CN_BROWSER}|g" "${CN_SCHEMA_OVERRIDE}"
7373 else
@@ -337,6 +337,9 @@ postinstall() {
337337 cp /usr/share/cnchi/gufw.svg ${CN_DESTDIR}/usr/share/icons/default/gufw.svg
338338 cp /usr/share/cnchi/gufw.png ${CN_DESTDIR}/usr/share/icons/hicolor/48x48/apps/gufw.png
339339 cp /usr/share/cnchi/gufw.desktop ${CN_DESTDIR}/usr/share/applications/gufw.desktop
340+
341+ # reborn-mirrorlist permission change
342+ chroot ${CN_DESTDIR} chmod 644 /etc/pacman.d/reborn-mirrorlist
340343
341344 # Configure makepkg so that it doesn't compress packages after building.
342345 # Most users are building packages to install them locally so there's no need for compression.
@@ -379,6 +382,8 @@ postinstall() {
379382 echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Gnome Desktop <---" >> ${CN_DESTDIR}/etc/environment
380383 chroot ${CN_DESTDIR} systemctl enable earlyoom
381384 chroot ${CN_DESTDIR} systemctl enable ufw
385+ cp /usr/share/cnchi/101_gnome.gschema.override ${CN_DESTDIR}/usr/share/glib-2.0/schemas/
386+ chroot ${CN_DESTDIR} /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
382387 fi
383388
384389 if [[ apricity = "${CN_DESKTOP}" ]]; then
@@ -570,6 +575,8 @@ if [[ cinnamon = "${CN_DESKTOP}" ]]; then
570575 echo "# ---> End added by Cnchi RebornOS Installer Gnome based for Cinnamon Desktop <---" >> ${CN_DESTDIR}/etc/environment
571576 chroot ${CN_DESTDIR} systemctl enable earlyoom
572577 chroot ${CN_DESTDIR} systemctl enable ufw
578+ cp /usr/share/cnchi/95_cinnamon.gschema.override ${CN_DESTDIR}/usr/share/glib-2.0/schemas/
579+ chroot ${CN_DESTDIR} /usr/bin/glib-compile-schemas /usr/share/glib-2.0/schemas
573580 fi
574581
575582 if [[ pantheon = "${CN_DESKTOP}" ]]; then
--- a/Cnchi/reborn-mirrorlist
+++ b/Cnchi/reborn-mirrorlist
@@ -1,9 +1,10 @@
1-################################################################################
2-#################### Reborn OS mirrorlist generated by hand ####################
3-################################################################################
1+#########################################################################
2+# RebornOS Mirrorlist generated by Cnchi RebornOS Installer Gnome based #
3+#########################################################################
44
55 # US Server
66 Server = https://repo.rebornos.org/RebornOS/
77
88 # European Server
99 Server = http://repo-de.rebornos.org/Reborn-OS/
10+
--- a/Cnchi/reborn-mirrorlist2
+++ b/Cnchi/reborn-mirrorlist2
@@ -1,9 +1,10 @@
1-################################################################################
2-#################### Reborn OS mirrorlist generated by hand ####################
3-################################################################################
1+#########################################################################
2+# RebornOS Mirrorlist generated by Cnchi RebornOS Installer Gnome based #
3+#########################################################################
44
55 # US Server
66 Server = https://repo.rebornos.org/RebornOS/
77
88 # European Server
9-#Server = https://repo.itmettke.de/Reborn-OS/
9+Server = http://repo-de.rebornos.org/Reborn-OS/
10+
--- a/airootfs/etc/reborn-mirrorlist
+++ b/airootfs/etc/reborn-mirrorlist
@@ -1,9 +1,10 @@
1-################################################################################
2-#################### Reborn OS mirrorlist generated by cnchi ###################
3-################################################################################
1+#########################################################################
2+# RebornOS Mirrorlist generated by Cnchi RebornOS Installer Gnome based #
3+#########################################################################
44
55 # US Server
66 Server = https://repo.rebornos.org/RebornOS/
77
88 # European Server
99 Server = http://repo-de.rebornos.org/Reborn-OS/
10+
--- a/build.sh
+++ b/build.sh
@@ -364,6 +364,7 @@ cp ${script_path}/Cnchi/pacman.conf ${work_dir}/${arch}/airootfs/usr/share/cnchi
364364 rm ${work_dir}/${arch}/airootfs/etc/pacman.conf
365365 cp ${script_path}/Cnchi/pacman.conf ${work_dir}/${arch}/airootfs/etc/
366366 chmod 644 /etc/pacman.conf
367+chmod 644 /etc/pacman.d/reborn-mirrorlist
367368 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/pacman.tmpl
368369 cp ${script_path}/Cnchi/pacman.tmpl ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/
369370 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
431432 cp ${script_path}/Cnchi/gufw.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/
432433 cp ${script_path}/Cnchi/gufw.svg ${work_dir}/${arch}/airootfs/usr/share/cnchi/
433434 cp ${script_path}/Cnchi/gufw.desktop ${work_dir}/${arch}/airootfs/usr/share/cnchi/
435+# Cinnamon gschema
436+cp ${script_path}/Cnchi/95_cinnamon.gschema.override ${work_dir}/${arch}/airootfs/usr/share/cnchi/
437+# Gnome gschema
438+cp ${script_path}/Cnchi/101_gnome.gschema.override ${work_dir}/${arch}/airootfs/usr/share/cnchi/
434439 echo "DONE"
435440 echo
436441 echo "Replacing Antergos mentions with RebornOS"
--- a/config
+++ b/config
@@ -9,4 +9,5 @@ CNCHI_REBORNOS_URL="https://repo.rebornos.org/RebornOS/sources/cnchi/0.16.21.zip
99
1010 # iso-hotfix-utility
1111 ISO_HOTFIX_UTILITY_VERSION="1.0.17"
12-ISO_HOTFIX_UTILITY_URL="https://github.com/Antergos/iso-hotfix-utility/archive/${ISO_HOTFIX_UTILITY_VERSION}.tar.gz"
12+# ISO_HOTFIX_UTILITY_URL="https://github.com/Antergos/iso-hotfix-utility/archive/${ISO_HOTFIX_UTILITY_VERSION}.tar.gz"
13+ISO_HOTFIX_UTILITY_URL="https://repo.rebornos.org/RebornOS/sources/cnchi/${ISO_HOTFIX_UTILITY_VERSION}.tar.gz"
--- a/packages.both
+++ b/packages.both
@@ -81,6 +81,25 @@ yaru-gtk-theme
8181 yaru-icon-theme
8282 yaru-sound-theme
8383
84+
85+# VirtualBox
86+#Virtualbox and xf86 packages? Whose bright idea was it to combine these? Oh wait... probably mine at one point
87+# virtualbox-guest-modules-arch --> It is no longer in the repository. Now present in the kernel.
88+# virtualbox-guest-utils
89+xf86-input-libinput
90+#xf86-input-mouse
91+xf86-video-amdgpu
92+xf86-video-ati
93+xf86-video-intel
94+xf86-video-dummy
95+xorg-apps
96+xorg-fonts
97+
98+
99+# VMWare
100+xf86-video-vmware
101+
102+
84103 # Scripts to aid in installing Arch Linux
85104 arch-install-scripts
86105
@@ -169,17 +188,6 @@ dnsutils
169188 netctl
170189 nss-mdns
171190
172-#Virtualbox and xf86 packages? Whose bright idea was it to combine these? Oh wait... probably mine at one point
173-# virtualbox-guest-modules-arch --> It is no longer in the repository. Now present in the kernel.
174-# virtualbox-guest-utils
175-xf86-input-libinput
176-#xf86-input-mouse
177-xf86-video-amdgpu
178-xf86-video-ati
179-xf86-video-intel
180-xf86-video-dummy
181-xorg-apps
182-xorg-fonts
183191
184192 # Now why does this guy get his own group?
185193 xf86-video-nouveau
Show on old repository browser