diff --git a/Wallpaper-nord/Mojave-nord-light.png b/Wallpaper-nord/Mojave-nord-light.png
index 0f00ecb..eb02fa8 100644
Binary files a/Wallpaper-nord/Mojave-nord-light.png and b/Wallpaper-nord/Mojave-nord-light.png differ
diff --git a/Wallpaper-nord/WhiteSur-nord-dark.png b/Wallpaper-nord/WhiteSur-nord-dark.png
new file mode 100644
index 0000000..04fc156
Binary files /dev/null and b/Wallpaper-nord/WhiteSur-nord-dark.png differ
diff --git a/Wallpaper-nord/WhiteSur-nord.png b/Wallpaper-nord/WhiteSur-nord-light.png
similarity index 100%
rename from Wallpaper-nord/WhiteSur-nord.png
rename to Wallpaper-nord/WhiteSur-nord-light.png
diff --git a/install-gnome-backgrounds.sh b/install-gnome-backgrounds.sh
index 5fb92bd..6a51e8d 100755
--- a/install-gnome-backgrounds.sh
+++ b/install-gnome-backgrounds.sh
@@ -63,9 +63,9 @@ install() {
[[ -d ${BACKGROUND_DIR}/${theme} ]] && rm -rf ${BACKGROUND_DIR}/${theme}
[[ -f ${PROPERTIES_DIR}/${theme}.xml ]] && rm -rf ${PROPERTIES_DIR}/${theme}.xml
mkdir -p ${BACKGROUND_DIR}/${theme}
- cp -r ${REPO_DIR}/${screen}/${theme}{'','-morning','-light'}.jpg ${BACKGROUND_DIR}/${theme}
- cp -r ${REPO_DIR}/xml-files/timed-xml-files/${theme}-timed.xml ${BACKGROUND_DIR}/${theme}
- cp -r ${REPO_DIR}/xml-files/gnome-background-properties/${theme}.xml ${PROPERTIES_DIR}
+ cp -a --no-preserve=ownership ${REPO_DIR}/${screen}/${theme}{'','-morning','-light'}.jpg ${BACKGROUND_DIR}/${theme}
+ cp -a --no-preserve=ownership ${REPO_DIR}/xml-files/timed-xml-files/${theme}-timed.xml ${BACKGROUND_DIR}/${theme}
+ cp -a --no-preserve=ownership ${REPO_DIR}/xml-files/gnome-background-properties/${theme}.xml ${PROPERTIES_DIR}
}
uninstall() {
@@ -75,6 +75,18 @@ uninstall() {
[[ -f ${PROPERTIES_DIR}/${theme}.xml ]] && rm -rf ${PROPERTIES_DIR}/${theme}.xml
}
+uninstall_nord() {
+ [[ -d ${BACKGROUND_DIR}/Wallpaper-nord ]] && rm -rf ${BACKGROUND_DIR}/${BACKGROUND_DIR}/Wallpaper-nord
+ [[ -f ${PROPERTIES_DIR}/Mojave.xml ]] && rm -rf ${PROPERTIES_DIR}/Mojave.xml
+}
+
+install_nord_wallpaper() {
+ prompt -w "Install Nord version in ${BACKGROUND_DIR}... \n"
+ mkdir -p ${BACKGROUND_DIR}/Wallpaper-nord
+ cp -a --no-preserve=ownership ${REPO_DIR}/Wallpaper-nord/{'Mojave-nord','WhiteSur-nord'}{'-dark','-light'}.png ${BACKGROUND_DIR}/Wallpaper-nord
+ cp -a --no-preserve=ownership ${REPO_DIR}/xml-files/gnome-background-properties/Mojave.xml ${PROPERTIES_DIR}
+}
+
while [[ $# -gt 0 ]]; do
case "${1}" in
-u|--uninstall)
@@ -163,9 +175,9 @@ install_wallpaper() {
uninstall_wallpaper() {
echo
- for theme in "${themes[@]}"; do
- uninstall "$theme"
- done
+ for theme in "${themes[@]}"; do
+ uninstall "$theme"
+ done
echo
}
@@ -177,9 +189,9 @@ if [[ $UID -ne $ROOT_UID ]]; then
fi
if [[ "${uninstall}" != 'true' ]]; then
- install_wallpaper
+ install_wallpaper && install_nord_wallpaper
else
- uninstall_wallpaper
+ uninstall_wallpaper && uninstall_nord
fi
prompt -s "Finished!"
diff --git a/install-wallpapers.sh b/install-wallpapers.sh
index e04ae82..ed36135 100755
--- a/install-wallpapers.sh
+++ b/install-wallpapers.sh
@@ -61,14 +61,24 @@ install() {
prompt -i "\n * Install ${theme}${color} in ${WALLPAPER_DIR}... "
mkdir -p "${WALLPAPER_DIR}"
[[ -f ${WALLPAPER_DIR}/${theme}${color}.png ]] && rm -rf ${WALLPAPER_DIR}/${theme}${color}.png
- cp -r ${REPO_DIR}/${screen}/${theme}${color}.png ${WALLPAPER_DIR}
+ cp -a --no-preserve=ownership ${REPO_DIR}/${screen}/${theme}${color}.png ${WALLPAPER_DIR}
+}
+
+install_nord() {
+ prompt -i "\n * Install Nord Wallpapers in ${WALLPAPER_DIR}... "
+ cp -a --no-preserve=ownership ${REPO_DIR}/Wallpaper-nord/{'Mojave-nord','WhiteSur-nord'}{'-dark','-light'}.png ${WALLPAPER_DIR}
}
uninstall() {
local theme="$1"
local color="$2"
prompt -i "\n * Uninstall ${theme}${color}... "
- [[ -f ${WALLPAPER_DIR}/${theme}${color}.png ]] && rm -rf ${WALLPAPER_DIR}/${theme}${color}.png
+ rm -rf ${WALLPAPER_DIR}/${theme}${color}.png
+}
+
+uninstall_nord() {
+ prompt -i "\n * Uninstall Nord Wallpapers... "
+ rm -rf ${WALLPAPER_DIR}/{'Mojave-nord','WhiteSur-nord'}{'-dark','-light'}.png
}
while [[ $# -gt 0 ]]; do
@@ -182,12 +192,6 @@ if [[ "${#screens[@]}" -eq 0 ]] ; then
screens=("${SCREEN_VARIANTS[0]}")
fi
-install_nord() {
- prompt -i "* Install Nord Wallpapers in ${WALLPAPER_DIR}... "
- mkdir -p "${WALLPAPER_DIR}"g
- cp -rf ${REPO_DIR}/Wallpaper-nord/*.png ${WALLPAPER_DIR}
-}
-
install_wallpaper() {
for theme in "${themes[@]}"; do
for color in "${colors[@]}"; do
@@ -214,7 +218,7 @@ if [[ "${uninstall}" != 'true' ]]; then
install_nord
fi
else
- uninstall_wallpaper
+ uninstall_wallpaper && uninstall_nord
fi
prompt -s "\n * All done!"
echo
diff --git a/src/WhiteSur-Nord.svg b/src/WhiteSur-Nord.svg
index 0baee96..32792cd 100644
--- a/src/WhiteSur-Nord.svg
+++ b/src/WhiteSur-Nord.svg
@@ -7,14 +7,14 @@
viewBox="0 0 1354.6666 762.00002"
version="1.1"
id="svg5"
- inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20, custom)"
+ inkscape:version="1.2.1 (9c6d41e410, 2022-07-14)"
sodipodi:docname="WhiteSur-Nord.svg"
+ xml:space="preserve"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns="http://www.w3.org/2000/svg"
- xmlns:svg="http://www.w3.org/2000/svg">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ y="0" />
diff --git a/xml-files/gnome-background-properties/Mojave.xml b/xml-files/gnome-background-properties/Mojave.xml
new file mode 100644
index 0000000..df114d9
--- /dev/null
+++ b/xml-files/gnome-background-properties/Mojave.xml
@@ -0,0 +1,13 @@
+
+
+
+
+ Mojave Nord Background
+ /usr/share/backgrounds/Wallpaper-nord/Mojave-nord-light.png
+ /usr/share/backgrounds/Wallpaper-nord/Mojave-nord-dark.png
+ zoom
+ solid
+ #3071AE
+ #000000
+
+
diff --git a/xml-files/gnome-background-properties/Monterey.xml b/xml-files/gnome-background-properties/Monterey.xml
index d3e4e42..6416c9c 100644
--- a/xml-files/gnome-background-properties/Monterey.xml
+++ b/xml-files/gnome-background-properties/Monterey.xml
@@ -3,6 +3,16 @@
Monterey Background
+ /usr/share/backgrounds/Monterey/Monterey-light.jpg
+ /usr/share/backgrounds/Monterey/Monterey.jpg
+ zoom
+ solid
+ #51a2da
+ #294172
+
+
+
+ Monterey Time of Day
/usr/share/backgrounds/Monterey/Monterey-timed.xml
zoom
solid
diff --git a/xml-files/gnome-background-properties/WhiteSur.xml b/xml-files/gnome-background-properties/WhiteSur.xml
index 45aa430..d2b6d46 100644
--- a/xml-files/gnome-background-properties/WhiteSur.xml
+++ b/xml-files/gnome-background-properties/WhiteSur.xml
@@ -3,6 +3,26 @@
WhiteSur Background
+ /usr/share/backgrounds/WhiteSur/WhiteSur-light.jpg
+ /usr/share/backgrounds/WhiteSur/WhiteSur.jpg
+ zoom
+ solid
+ #51a2da
+ #294172
+
+
+
+ WhiteSur Nord Background
+ /usr/share/backgrounds/Wallpaper-nord/WhiteSur-nord-light.png
+ /usr/share/backgrounds/Wallpaper-nord/WhiteSur-nord-dark.png
+ zoom
+ solid
+ #6882b3
+ #455a85
+
+
+
+ WhiteSur Time of Day
/usr/share/backgrounds/WhiteSur/WhiteSur-timed.xml
zoom
solid