Wayland compatible

2 files changed, 12 insertions, 67 deletions

diff --git a/autoWall b/autoWall
deleted file mode 100755
index 8b709ed..0000000
--- a/autoWall
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/usr/bin/bash
-
-wallDir=/media/Wall
-
-for action in $@
-do
-  if [ ${action:0:1} = "+" ]
-  then
-    if [ -d ${wallDir}/${action:1} ]
-    then
-      echo ${action:1}/ >> ${wallDir}/listDirWall
-    fi
-  fi
-  if [ ${action} = "list" ]
-  then
-      for d in `ls ${wallDir}`
-      do
-          if [ -d "${wallDir}/${d}" ]; then
-              echo "$d/"
-          fi
-      done
-      echo
-  fi
-  if [ ${action:0:1} = "-" ]
-  then
-    if [ -d ${wallDir}/${action:1} ]
-    then
-      sed -i "/${action:1}/d" ${wallDir}/listDirWall
-    fi
-  fi
-  if [ ${action:0:1} = "=" ]
-  then
-    if [ -d ${wallDir}/${action:1} ]
-    then
-      sed -i "/^${action:1}\/$/d" ${wallDir}/listDirWall
-    fi
-  fi
-done
-
-cmpWall=0
-
-for ligne in `cat ${wallDir}/listDirWall`
-do
-  cmpWall=$(( cmpWall + `ls "${wallDir}/$ligne" | wc -l` ))
-  echo "$ligne : "
-done
-
-randWall=$[( $RANDOM % $cmpWall )]
-
-
-for ligne in `cat ${wallDir}/listDirWall`
-do
-  if [ `ls "${wallDir}/$ligne" | wc -l` -gt $randWall ]
-  then
-    echo ${wallDir}/$ligne`ls ${wallDir}/$ligne | head -n $randWall | tail -n 1` > ~/.actWall
-    nitrogen --set-zoom-fill ${wallDir}/$ligne`ls ${wallDir}/$ligne | head -n $randWall | tail -n 1`
-    echo "Wall set "   ${wallDir}/$ligne`ls ${wallDir}/$ligne | head -n $randWall | tail -n 1`
-    break
-  else
-    randWall=$(( randWall - `ls "${wallDir}/$ligne" | wc -l` ))
-  fi
-done
-
-echo $cmpWall
diff --git a/autoWall.sh b/autoWall.sh
index 8b709ed..b3df352 100755
--- a/autoWall.sh
+++ b/autoWall.sh
@@ -2,6 +2,12 @@
 
 wallDir=/media/Wall
 
+cmd='nitrogen --set-zoom-fill %s'
+
+if [ -n "$WAYLAND_DISPLAY" ] ; then
+  cmd='swaymsg output "*" background %s fill'
+fi
+
 for action in $@
 do
   if [ ${action:0:1} = "+" ]
@@ -52,9 +58,12 @@ for ligne in `cat ${wallDir}/listDirWall`
 do
   if [ `ls "${wallDir}/$ligne" | wc -l` -gt $randWall ]
   then
-    echo ${wallDir}/$ligne`ls ${wallDir}/$ligne | head -n $randWall | tail -n 1` > ~/.actWall
-    nitrogen --set-zoom-fill ${wallDir}/$ligne`ls ${wallDir}/$ligne | head -n $randWall | tail -n 1`
-    echo "Wall set "   ${wallDir}/$ligne`ls ${wallDir}/$ligne | head -n $randWall | tail -n 1`
+    wall=${wallDir}/$ligne`ls ${wallDir}/$ligne | head -n $randWall | tail -n 1`
+    echo ${wall} > ~/.actWall
+    cmd=$(printf "${cmd}" ${wall})
+    echo ${cmd}
+    eval ${cmd}
+    echo "Wall set $wall"
     break
   else
     randWall=$(( randWall - `ls "${wallDir}/$ligne" | wc -l` ))