X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=GNUmakefile;h=e38637daae86ac9fb782222d2387e8dd7efa973d;hb=7c0f47b95e93216b53260235d8e4599b1a9dd2c5;hp=107eae235871179e7ae790efce16ae4194e1634f;hpb=ed4d72a28e9df4da16e644b73514129c2f2d3e56;p=sugar.git

diff --git a/GNUmakefile b/GNUmakefile
index 107eae2..e38637d 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,24 +3,30 @@ help:
 	@echo "  .:. Sugar - The Dot-Files Manager .:."
 	@echo
 	@echo "Usage:"
-	@echo "  make lint    - lint The Sugar System"
-	@echo "  make update  - update repository with the current dot files"
-	@echo "  make commit  - commit changes to the repository"
-	@echo "  make install - update the current dot files with the repository"
+	@echo "  make lint    - lint The Sugar System."
+	@echo "  make update  - update repository with the current dot files."
+	@echo "  make commit  - commit changes to the repository."
+	@echo "  make install - update the current dot files with the repository."
 	@echo "  make import FILES=<FILES>"
-	@echo "               - import the dot files into the repository"
+	@echo "               - import the dot files into the repository."
+	@echo "  make import-all"
+	@echo "               - import every uncontrolled dot files, which aren't"
+	@echo "                 ignored, into the repository."
+	@echo "  make diff FILE=<FILE>"
+	@echo "               - show diff of the dot file."
 	@echo
 
 lint:
 	perl ./tools/list-files.pl | perl ./tools/find-missing.pl
 	perl ./tools/list-files.pl | perl ./tools/find-outdated.pl
 	perl ./tools/list-files.pl | perl ./tools/find-changed.pl
+	-git status
 
 update:
 	git pull
 	perl ./tools/list-files.pl | perl ./tools/update.pl
 	perl ./tools/list-files.pl | perl ./tools/find-outdated.pl
-	git status
+	-git status
 
 commit:
 	git add -A
@@ -38,8 +44,25 @@ import:
 	@exit 1
 else
 import:
-	perl ./tools/import.pl $(FILES)
+	(for i in $(FILES); do echo $$i; done) | perl ./tools/import.pl
+	-git status
+endif
+
+import-all:
+	perl ./tools/list-files.pl | \
+		perl ./tools/find-missing.pl | \
+		cut -b 3- | \
+		perl ./tools/import.pl
 	-git status
+
+ifeq ($(FILE),)
+diff:
+	@echo "Specify one file."
+	@echo "Usage: make diff FILE=<FILE>"
+	@exit 1
+else
+diff:
+	perl ./tools/diff.pl $(FILE) | $(PAGER)
 endif
 
-.PHONY: help lint update commit install import
+.PHONY: help lint update commit install import diff