From 9d4cc66b80eba6b4fe0ce2a436a7512e580ee2f2 Mon Sep 17 00:00:00 2001
From: "Stuart B. Wilkins" <swilkins@bnl.gov>
Date: Wed, 21 Oct 2020 08:57:56 -0400
Subject: [PATCH 1/4] Initial changes to use running desktop

---
 bin/set-wallpaper | 32 +++++++++++++++++---------------
 1 file changed, 17 insertions(+), 15 deletions(-)

diff --git a/bin/set-wallpaper b/bin/set-wallpaper
index 44e640e..a5eaa4e 100644
--- a/bin/set-wallpaper
+++ b/bin/set-wallpaper
@@ -4,21 +4,23 @@ GSETTINGS=/usr/bin/gsettings
 XFCONF=/usr/bin/xfconf-query
 
 # Disable the built in screensaver and show wallpaper
-if command -v ${GSETTINGS} &> /dev/null
-then
-  ${GSETTINGS} set org.gnome.desktop.background picture-uri \
-    'file:///usr/share/nsls2/wallpapers/wallpaper.jpg'
-  ${GSETTINGS} set org.cinnamon.desktop.background picture-uri \
-    'file:///usr/share/nsls2/wallpapers/wallpaper.jpg'
+if [ echo "${XDG_CURRENT_DESKTOP}" | grep GNOME ]; then
+  if [ command -v ${GSETTINGS} &> /dev/null ]; then
+    ${GSETTINGS} set org.gnome.desktop.background picture-uri \
+      'file:///usr/share/nsls2/wallpapers/wallpaper.jpg'
+    ${GSETTINGS} set org.cinnamon.desktop.background picture-uri \
+      'file:///usr/share/nsls2/wallpapers/wallpaper.jpg'
+  fi
 fi
 
-if command -v ${XFCONF} &> /dev/null
-then
-  for item in $(${XFCONF} --channel xfce4-desktop --list | grep 'last-image\|image-path')
-  do
-    echo ${item}
-    ${XFCONF} --channel xfce4-desktop \
-      --property ${item} \
-      --set /usr/share/nsls2/wallpapers/wallpaper.jpg
-  done
+if [ echo "${XDG_CURRENT_DESKTOP}" | grep XFCE ]; then
+  if [ command -v ${XFCONF} &> /dev/null ]; then
+    for item in $(${XFCONF} --channel xfce4-desktop --list | grep 'last-image\|image-path')
+    do
+      echo ${item}
+      ${XFCONF} --channel xfce4-desktop \
+        --property ${item} \
+        --set /usr/share/nsls2/wallpapers/wallpaper.jpg
+    done
+  fi
 fi

From 675b991b29c475467f9c38a1490f6d65edb266ac Mon Sep 17 00:00:00 2001
From: "Stuart B. Wilkins" <swilkins@bnl.gov>
Date: Wed, 21 Oct 2020 13:19:18 -0400
Subject: [PATCH 2/4] Add comments

---
 bin/set-wallpaper | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/bin/set-wallpaper b/bin/set-wallpaper
index a5eaa4e..dd463ec 100644
--- a/bin/set-wallpaper
+++ b/bin/set-wallpaper
@@ -6,6 +6,7 @@ XFCONF=/usr/bin/xfconf-query
 # Disable the built in screensaver and show wallpaper
 if [ echo "${XDG_CURRENT_DESKTOP}" | grep GNOME ]; then
   if [ command -v ${GSETTINGS} &> /dev/null ]; then
+    echo "Setting Wallpaper for GNOME"
     ${GSETTINGS} set org.gnome.desktop.background picture-uri \
       'file:///usr/share/nsls2/wallpapers/wallpaper.jpg'
     ${GSETTINGS} set org.cinnamon.desktop.background picture-uri \
@@ -15,6 +16,7 @@ fi
 
 if [ echo "${XDG_CURRENT_DESKTOP}" | grep XFCE ]; then
   if [ command -v ${XFCONF} &> /dev/null ]; then
+    echo "Setting Wallpaper for XFCE"
     for item in $(${XFCONF} --channel xfce4-desktop --list | grep 'last-image\|image-path')
     do
       echo ${item}

From cec58b4dc3dfe6764bae62193fd69eb5cbe3092f Mon Sep 17 00:00:00 2001
From: "Stuart B. Wilkins" <swilkins@bnl.gov>
Date: Wed, 21 Oct 2020 13:20:22 -0400
Subject: [PATCH 3/4] Set to ignore branch

---
 .vscode/tasks.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 7fce6af..2989efc 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -38,7 +38,7 @@
             "command": "gbp",
             "args" : [
                 "buildpackage",
-                "--git-debian-branch=main",
+                "--git-ignore-branch",
                 "-uc",
                 "-us",
                 "--git-tarball-dir=${workspaceFolder}/build",
@@ -46,4 +46,4 @@
             ],
         }
     ]
-}
\ No newline at end of file
+}

From fdb1c6552b5af008ba69f9946e74d9fa88b8d812 Mon Sep 17 00:00:00 2001
From: "Stuart B. Wilkins" <swilkins@bnl.gov>
Date: Thu, 29 Oct 2020 06:17:58 -0400
Subject: [PATCH 4/4] [DBG] Show dirs

---
 .vscode/tasks.json | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
index 2989efc..80af446 100644
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -8,42 +8,42 @@
             "type": "shell",
             "command": "make",
             "problemMatcher": [],
-            "group": {
-                "kind": "build",
-                "isDefault": true
-            }
-        },{
+            "group": "build"
+        },
+        {
             "label": "Make Build Directory",
-            "problemMatcher" : [],
+            "problemMatcher": [],
             "command": "mkdir",
-            "args" : [
+            "args": [
                 "-p",
                 "${workspaceFolder}/build"
             ]
-        },{
+        },
+        {
             "label": "Fetch Upstream Tarball",
             "group": "build",
-            "problemMatcher" : [],
+            "problemMatcher": [],
             "command": "uscan",
-            "args" : [
+            "args": [
                 "--force-download",
                 "--destdir",
                 "${workspaceFolder}/build"
             ],
             "dependsOn": "Make Build Directory"
-        },{
+        },
+        {
             "label": "Build Debian Package",
             "group": "build",
             "problemMatcher": [],
             "command": "gbp",
-            "args" : [
+            "args": [
                 "buildpackage",
                 "--git-ignore-branch",
                 "-uc",
                 "-us",
                 "--git-tarball-dir=${workspaceFolder}/build",
                 "--git-export-dir=${workspaceFolder}/build"
-            ],
+            ]
         }
     ]
 }