Merge 026d854905 into 093c1a79f5

README.md

@@ -109,7 +109,7 @@ $ ./setup.sh
 </p>
 
 <p align="center">
-  <!-- sponsors --><a href="https://github.com/davidtoska"><img src="https:&#x2F;&#x2F;github.com&#x2F;davidtoska.png" width="60px" alt="User avatar: David Toska" /></a><a href="https://github.com/dgxlab"><img src="https:&#x2F;&#x2F;github.com&#x2F;dgxlab.png" width="60px" alt="User avatar: David Vargas" /></a><a href="https://github.com/maksimdymov"><img src="https:&#x2F;&#x2F;github.com&#x2F;maksimdymov.png" width="60px" alt="User avatar: Maksim" /></a><!-- sponsors -->
+  <!-- sponsors --><a href="https://github.com/davidtoska"><img src="https:&#x2F;&#x2F;github.com&#x2F;davidtoska.png" width="60px" alt="User avatar: David Toska" /></a><a href="https://github.com/dgxlab"><img src="https:&#x2F;&#x2F;github.com&#x2F;dgxlab.png" width="60px" alt="User avatar: David Vargas" /></a><!-- sponsors -->
 </p>
 
 ---

files/powermenu/type-1/powermenu.sh

@@ -95,9 +95,9 @@ case ${chosen} in
 		run_cmd --reboot
         ;;
     $lock)
-		if [[ -x '/usr/bin/betterlockscreen' ]]; then
+		if command -v betterlockscreen >/dev/null 2>&1; then
 			betterlockscreen -l
-		elif [[ -x '/usr/bin/i3lock' ]]; then
+		elif command -v i3lock >/dev/null 2>&1; then
 			i3lock
 		fi
         ;;

files/powermenu/type-2/powermenu.sh

@@ -96,9 +96,9 @@ case ${chosen} in
 		run_cmd --reboot
         ;;
     $lock)
-		if [[ -x '/usr/bin/betterlockscreen' ]]; then
+		if command -v betterlockscreen >/dev/null 2>&1; then
 			betterlockscreen -l
-		elif [[ -x '/usr/bin/i3lock' ]]; then
+		elif command -v i3lock >/dev/null 2>&1; then
 			i3lock
 		fi
         ;;

files/powermenu/type-3/powermenu.sh

@@ -90,9 +90,9 @@ case ${chosen} in
 		run_cmd --reboot
         ;;
     $lock)
-		if [[ -x '/usr/bin/betterlockscreen' ]]; then
+		if command -v betterlockscreen >/dev/null 2>&1; then
 			betterlockscreen -l
-		elif [[ -x '/usr/bin/i3lock' ]]; then
+		elif command -v i3lock >/dev/null 2>&1; then
 			i3lock
 		fi
         ;;

files/powermenu/type-4/powermenu.sh

@@ -90,9 +90,9 @@ case ${chosen} in
 		run_cmd --reboot
         ;;
     $lock)
-		if [[ -x '/usr/bin/betterlockscreen' ]]; then
+		if command -v betterlockscreen >/dev/null 2>&1; then
 			betterlockscreen -l
-		elif [[ -x '/usr/bin/i3lock' ]]; then
+		elif command -v i3lock >/dev/null 2>&1; then
 			i3lock
 		fi
         ;;

files/powermenu/type-5/powermenu.sh

@@ -102,9 +102,9 @@ case ${chosen} in
 		run_cmd --hibernate
         ;;
     $lock)
-		if [[ -x '/usr/bin/betterlockscreen' ]]; then
+		if command -v betterlockscreen >/dev/null 2>&1; then
 			betterlockscreen -l
-		elif [[ -x '/usr/bin/i3lock' ]]; then
+		elif command -v i3lock >/dev/null 2>&1; then
 			i3lock
 		fi
         ;;

files/powermenu/type-6/powermenu.sh

@@ -102,9 +102,9 @@ case ${chosen} in
 		run_cmd --hibernate
         ;;
     $lock)
-		if [[ -x '/usr/bin/betterlockscreen' ]]; then
+		if command -v betterlockscreen >/dev/null 2>&1; then
 			betterlockscreen -l
-		elif [[ -x '/usr/bin/i3lock' ]]; then
+		elif command -v i3lock >/dev/null 2>&1; then
 			i3lock
 		fi
         ;;