Auto commit by The Sugar System.

[sugar.git] / GNUmakefile

diff --git a/GNUmakefile b/GNUmakefile
index 107eae235871179e7ae790efce16ae4194e1634f..86d0c9f97c2e12c36f5607da3287b4d0f02cc14d 100644 (file)
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -3,24 +3,32 @@ 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 current dot files with the repository."
        @echo "  make import FILES=<FILES>"
-       @echo "               - import the dot files into the repository"
+       @echo "               - import 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 export FILES=<FILES>"
+       @echo "               - export dot files from 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 +46,37 @@ 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
 
-.PHONY: help lint update commit install import
+import-all:
+       perl ./tools/list-files.pl | \
+               perl ./tools/find-missing.pl | \
+               cut -b 3- | \
+               perl ./tools/import.pl
+       -git status
+
+ifeq ($(FILES),)
+export:
+       @echo "Specify at least one file."
+       @echo "Usage: $(MAKE) export FILES=<FILES>"
+       @exit 1
+else
+export:
+       @echo $(FILES) | \
+               tr -s " " "\n" | \
+               perl ./tools/export.pl
+endif
+
+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 export diff