Fixed install target: do not stop in the middle if fvwm is not here.
authorOleksandr Gavenko <gavenkoa@gmail.com>
Fri, 08 Jan 2021 13:26:37 +0200
changeset 963 d008686721c6
parent 962 88a1ce08b362
child 964 e0451bc7141f
Fixed install target: do not stop in the middle if fvwm is not here.
Makefile
--- a/Makefile	Fri Jan 08 13:24:06 2021 +0200
+++ b/Makefile	Fri Jan 08 13:26:37 2021 +0200
@@ -124,16 +124,17 @@
 	done
 	$(INSTALL_DATA) -t $(HOME) "$${files[@]}"
 	chmod 700 ~/.gnupg/
-	chmod a+x ~/.fvwm/FvwmKbdd.pl ~/.fvwm/xinit
-	command -v fvwm || exit 0
-	for f in /etc/xdg/menus/*.menu; do
-		[[ -f "$$f" ]] || continue
-		fname=$${f%.menu}
-		fname=$${fname##*/}
-		python .fvwm/xdg2fvwm.py Menu-$$fname $$f >~/.fvwm/$$fname.hook
-		echo "Read $$[HOME]/.fvwm/$$fname.hook" >>~/.fvwm/config
-		echo "AddToMenu MenuMyRoot $$fname Popup Menu-$$fname" >>~/.fvwm/config
-	done
+	if command -v fvwm; then
+		chmod a+x ~/.fvwm/FvwmKbdd.pl ~/.fvwm/xinit
+		for f in /etc/xdg/menus/*.menu; do
+			[[ -f "$$f" ]] || continue
+			fname=$${f%.menu}
+			fname=$${fname##*/}
+			python .fvwm/xdg2fvwm.py Menu-$$fname $$f >~/.fvwm/$$fname.hook
+			echo "Read $$[HOME]/.fvwm/$$fname.hook" >>~/.fvwm/config
+			echo "AddToMenu MenuMyRoot $$fname Popup Menu-$$fname" >>~/.fvwm/config
+		done
+	fi
 	mkdir -p ~/.screenshot
 	for item in $(IFNONEXIST_ITEMS); do
 		if [[ -f $$item ]] && ! [[ -f $(HOME)/$$item ]]; then