2020.05.25 update

[rebornos/cnchi-gnome-osdn.git] / build.sh

diff --git a/build.sh b/build.sh
index 9561714..f8f0d4c 100755 (executable)
--- a/build.sh
+++ b/build.sh
@@ -297,8 +297,6 @@ cp ${script_path}/Cnchi/check.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/sr
 #cp ${script_path}/Cnchi/timezone.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/welcome.py
 cp ${script_path}/Cnchi/welcome.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
-#rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
-#cp ${script_path}/Cnchi/desktop.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
 #rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/download/metalink.py
 #cp ${script_path}/Cnchi/metalink.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/download/
 #rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/installation/pac.py
@@ -357,7 +355,7 @@ cp ${script_path}/images/desktop-environment-budgie.svg ${work_dir}/${arch}/airo
 cp ${script_path}/images/desktop-environment-i3.svg ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/icons/scalable/
 cp ${script_path}/Cnchi/reborn-mirrorlist ${work_dir}/${arch}/airootfs/etc/pacman.d/
 #
-# Replacement made by Rafael from RebornOS
+# ===>>> Replacement made by Rafael from RebornOS <<<=== #
 #
 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/pacman.conf
 cp ${script_path}/Cnchi/pacman.conf ${work_dir}/${arch}/airootfs/usr/share/cnchi/
@@ -395,47 +393,59 @@ rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/slides.py
 cp ${script_path}/Cnchi/slides.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pacman/pac.py
 cp ${script_path}/Cnchi/pac.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pacman/
-# Use neofetch to show in terminal RebornOS logo and info
+# ===>>> Use neofetch to show in terminal RebornOS logo and info <<<=== #
 rm ${work_dir}/${arch}/airootfs/home/rebornos/.bashrc
 cp ${script_path}/Cnchi/bashrc ${work_dir}/${arch}/airootfs/home/rebornos/.bashrc
-# Correct GeoIP timeout
+# ===>>> Correct GeoIP timeout <<<=== #
 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/geoip.py
 cp ${script_path}/Cnchi/geoip.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/
-# cnchi-start.sh is modified in its original location
+# ===>>> cnchi-start.sh is modified in its original location <<<=== #
 # rm ${work_dir}/${arch}/airootfs/usr/bin/cnchi-start.sh
 # cp ${script_path}/Cnchi/cnchi-start.sh ${work_dir}/${arch}/airootfs/usr/bin/
-# Replace access to the RebornOS installer with another one with "sudo"
+# ===>>> Replace access to the RebornOS installer with another one with "sudo" <<<=== #
 rm ${work_dir}/${arch}/airootfs/usr/share/applications/antergos-install.desktop
-cp ${script_path}/Cnchi/antergos-install.desktop ${work_dir}/${arch}/airootfs/usr/share/applications/
-# Add new cnchi icon for RebornOS Installer
+cp ${script_path}/Cnchi/rebornos-install.desktop ${work_dir}/${arch}/airootfs/usr/share/applications/
+# ===>>> Add new cnchi icon for RebornOS Installer (change her name from reborn to rebornos) <<<=== #
 rm ${work_dir}/${arch}/airootfs/usr/share/pixmaps/cnchi.png
 cp ${script_path}/Cnchi/cnchi.png ${work_dir}/${arch}/airootfs/usr/share/pixmaps/
-cp ${script_path}/Cnchi/reborn-icon-new.png ${work_dir}/${arch}/airootfs/usr/share/pixmaps/
+cp ${script_path}/Cnchi/rebornos-icon-new.png ${work_dir}/${arch}/airootfs/usr/share/pixmaps/
 cp ${script_path}/Cnchi/cnchi.png ${work_dir}/${arch}/airootfs/usr/share/applications/
-# Add new wallpaper for RebornOS Live
+# ===>>> Add new wallpaper for RebornOS Live <<<=== #
 rm ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-day.jpg
 cp ${script_path}/Cnchi/adwaita-day.jpg ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/
 rm ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-morning.jpg
 cp ${script_path}/Cnchi/adwaita-day.jpg ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-morning.jpg
 rm ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-night.jpg
 cp ${script_path}/Cnchi/adwaita-day.jpg ${work_dir}/${arch}/airootfs/usr/share/backgrounds/gnome/adwaita-night.jpg
-# Delete refresh.desktop in ~/.config/autostart and add new refresh-keys.desktop
-# to refresh keys and run cnchi-start.sh when Live start
+# ===>>> Delete refresh.desktop in ~/.config/autostart and add new refresh-keys.desktop
+# to refresh keys and run cnchi-start.sh when Live start <<<=== #
 rm ${work_dir}/${arch}/airootfs/home/rebornos/.config/autostart/refresh.desktop
 cp ${script_path}/Cnchi/refresh-keys.desktop ${work_dir}/${arch}/airootfs/home/rebornos/.config/autostart/
-# Add refresh-keys.sh to /usr/bin (called by install.desktop)
-# In the end, call cnchi-start.sh
+# ===>>> Add refresh-keys.sh to /usr/bin (called by install.desktop)
+# In the end, call cnchi-start.sh <<<=== #
 cp ${script_path}/Cnchi/refresh-keys.sh ${work_dir}/${arch}/airootfs/usr/bin/
 rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/scripts/10_antergos
 cp ${script_path}/Cnchi/10_antergos ${work_dir}/${arch}/airootfs/usr/share/cnchi/scripts/
-# Uncomplicated Firewall Workaround
+# ===>>> Uncomplicated Firewall Workaround <<<=== #
 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
+# ===>>> Cinnamon gschema <<<=== #
 cp ${script_path}/Cnchi/95_cinnamon.gschema.override ${work_dir}/${arch}/airootfs/usr/share/cnchi/
-# Gnome gschema
+# ===>>> Gnome gschema <<<=== #
 cp ${script_path}/Cnchi/101_gnome.gschema.override ${work_dir}/${arch}/airootfs/usr/share/cnchi/
+# ===>>> auto_partition.py modifications (change AntergosRoot by RebornOSRoot and others things...) <<<=== #
+rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/installation/auto_partition.py
+cp ${script_path}/Cnchi/auto_partition.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/installation/
+# ===>>> Replace desktop.py to start with the default "base" desktop <<<=== #
+rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
+cp ${script_path}/Cnchi/desktop.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/
+# ===>>> Change main_window.py with new rebornos-logo-mini2.png and rebornos-icon.png <<<=== #
+rm ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/main_window.py
+cp ${script_path}/Cnchi/main_window.py ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/
+# ===>>> Add new png files used by modify main_window.py  <<<=== #
+cp ${script_path}/Cnchi/rebornos-logo-mini2.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/
+cp ${script_path}/Cnchi/rebornos-icon.png ${work_dir}/${arch}/airootfs/usr/share/cnchi/data/images/antergos/
 echo "DONE"
 echo
 echo "Replacing Antergos mentions with RebornOS"
@@ -456,9 +466,9 @@ sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/
 sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/wireless.py
 sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/zfs.py
 sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
-sed -i "s/gnome/deepin/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py
-#sed -i "s/Antergos/Reborn/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/encfs.py
-sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/main_window.py
+# sed -i "s/gnome/deepin/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/pages/desktop.py ==>> Commented to run "base" desktop preselected
+# sed -i "s/Antergos/Reborn/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/encfs.py
+# sed -i "s/Antergos/RebornOS/g" ${work_dir}/${arch}/airootfs/usr/share/cnchi/src/main_window.py
 echo "DONE"
 echo
 echo "Removing Mycroft-RebornOS's startup file from the ISO..."