Update README.md

README.md

@@ -1,23 +1,4 @@
-
-# MacOS Wallpapers for linux desktop
-
-## WhiteSur (Big Sur) Wallpapers
-![1](1080p/WhiteSur-light.png)
-![2](1080p/WhiteSur.png)
-![3](1080p/WhiteSur-dark.png)
-
-## Monterey Wallpapers
-![1](1080p/Monterey-light.png)
-![2](1080p/Monterey.png)
-![3](1080p/Monterey-dark.png)
-
-## Nord Wallpapers
-![1](Wallpaper-nord/Mojave-nord-dark.png)
-![2](Wallpaper-nord/WhiteSur-nord.png)
-![3](Wallpaper-nord/Monterey-nord.png)
-
 ## Installation
-
 ### Install Gnome Backgrounds (wallpaper will change according to time)
 
 ```sh
@@ -49,3 +30,20 @@ sudo ./install-gnome-backgrounds.sh
   -u, --uninstall         Uninstall wallpappers
   -h, --help              Show help
 ```
+
+## WhiteSur (Big Sur) Wallpapers
+![1](1080p/WhiteSur-light.png)
+![2](1080p/WhiteSur.png)
+![3](1080p/WhiteSur-dark.png)
+
+## Monterey Wallpapers
+![1](1080p/Monterey-light.png)
+![2](1080p/Monterey.png)
+![3](1080p/Monterey-dark.png)
+
+## Nord Wallpapers
+![1](Wallpaper-nord/Mojave-nord-light.png)
+![2](Wallpaper-nord/Mojave-nord-dark.png)
+![3](Wallpaper-nord/WhiteSur-nord-light.png)
+![4](Wallpaper-nord/WhiteSur-nord-dark.png)
+![5](Wallpaper-nord/Monterey-nord.png)

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!"

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

xml-files/gnome-background-properties/Mojave.xml

@@ -0,0 +1,13 @@
+<?xml version="1.0"?>
+<!DOCTYPE wallpapers SYSTEM "gnome-wp-list.dtd">
+<wallpapers>
+  <wallpaper deleted="false">
+    <name>Mojave Nord Background</name>
+    <filename>/usr/share/backgrounds/Wallpaper-nord/Mojave-nord-light.png</filename>
+    <filename-dark>/usr/share/backgrounds/Wallpaper-nord/Mojave-nord-dark.png</filename-dark>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#3071AE</pcolor>
+    <scolor>#000000</scolor>
+  </wallpaper>
+</wallpapers>

xml-files/gnome-background-properties/Monterey.xml

@@ -3,6 +3,16 @@
 <wallpapers>
   <wallpaper deleted="false">
     <name>Monterey Background</name>
+    <filename>/usr/share/backgrounds/Monterey/Monterey-light.jpg</filename>
+    <filename-dark>/usr/share/backgrounds/Monterey/Monterey.jpg</filename-dark>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#51a2da</pcolor>
+    <scolor>#294172</scolor>
+  </wallpaper>
+
+  <wallpaper deleted="false">
+    <name>Monterey Time of Day</name>
     <filename>/usr/share/backgrounds/Monterey/Monterey-timed.xml</filename>
     <options>zoom</options>
     <shade_type>solid</shade_type>

xml-files/gnome-background-properties/WhiteSur.xml

@@ -3,6 +3,26 @@
 <wallpapers>
   <wallpaper deleted="false">
     <name>WhiteSur Background</name>
+    <filename>/usr/share/backgrounds/WhiteSur/WhiteSur-light.jpg</filename>
+    <filename-dark>/usr/share/backgrounds/WhiteSur/WhiteSur.jpg</filename-dark>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#51a2da</pcolor>
+    <scolor>#294172</scolor>
+  </wallpaper>
+
+  <wallpaper deleted="false">
+    <name>WhiteSur Nord Background</name>
+    <filename>/usr/share/backgrounds/Wallpaper-nord/WhiteSur-nord-light.png</filename>
+    <filename-dark>/usr/share/backgrounds/Wallpaper-nord/WhiteSur-nord-dark.png</filename-dark>
+    <options>zoom</options>
+    <shade_type>solid</shade_type>
+    <pcolor>#6882b3</pcolor>
+    <scolor>#455a85</scolor>
+  </wallpaper>
+
+  <wallpaper deleted="false">
+    <name>WhiteSur Time of Day</name>
     <filename>/usr/share/backgrounds/WhiteSur/WhiteSur-timed.xml</filename>
     <options>zoom</options>
     <shade_type>solid</shade_type>