[Gsrc-commit] /srv/bzr/gsrc/trunk r1406: add installation state to pkg-info

[Brandon Invergo]

------------------------------------------------------------
revno: 1406
committer: Brandon Invergo <address@hidden>
branch nick: trunk
timestamp: Wed 2012-12-12 23:30:31 +0100
message:
  add installation state to pkg-info
modified:
  ChangeLog
  gar.mk

=== modified file 'ChangeLog'
--- a/ChangeLog 2012-12-11 22:56:21 +0000
+++ b/ChangeLog 2012-12-12 22:30:31 +0000
@@ -1,3 +1,9 @@
+2012-12-12  Brandon Invergo  <address@hidden>
+
+       * gar.mk (pkg-info): add installation state info
+       (install-p): fancy output
+       (reinstall-p): fancy output
+
 2012-12-11  Brandon Invergo  <address@hidden>
 
        * gar.lib.mk (CREATED_MERGE_DIRS): don't use this variable; it

=== modified file 'gar.mk'
--- a/gar.mk    2012-12-10 22:53:36 +0000
+++ b/gar.mk    2012-12-12 22:30:31 +0000
@@ -125,10 +125,16 @@
 # what just happened when all the dependencies are finished.
 
 pkg-info:
-       @echo -e "$(MSG)Name:$(OFF) $(GARNAME)"
-       @echo -e "$(MSG)Version:$(OFF) $(GARVERSION)"
+       @echo -e "$(MSG)Name:        $(GARNAME)$(OFF)"
+       @echo -e "$(MSG)Version:$(OFF)     $(GARVERSION)"
+       @echo -e "$(MSG)URL:$(OFF)         $(HOME_URL)"
        @echo -e "$(MSG)Description:$(OFF) $(DESCRIPTION)"
-       @echo -e "$(MSG)URL:$(OFF) $(HOME_URL)"
+       @($(MAKE) install-p >/dev/null 2>/dev/null && \
+               echo -e "$(MSG)Status$(OFF):      installed (stowed)") || \
+               ($(MAKE) reinstall-p >/dev/null 2>/dev/null && \
+                       echo -e "$(MSG)Status:$(OFF)      installed (not 
stowed)") || \
+                       echo -e "$(MSG)Status:$(OFF)      not installed"
+
 
 # fetch-list   - Show list of files that would be retrieved by fetch.
 # NOTE: DOES NOT RUN pre-everything!
@@ -270,10 +276,13 @@
 # returns true if install has completed successfully, false
 # otherwise
 install-p:
-       @test -h $(dotgardir)/VERSION && test "`readlink $(dotgardir)/VERSION`" 
= $(PACKAGENAME) && echo $(PACKAGENAME) is installed
+       @test -h $(dotgardir)/VERSION && \
+               test "`readlink $(dotgardir)/VERSION`" = $(PACKAGENAME) && \
+               echo -e "[$(OK)install-p$(OFF)] $(MSG)$(PACKAGENAME) is 
installed$(OFF)" 
 
 reinstall-p:
-       @test -d $(packagesdir)/$(PACKAGENAME) && echo $(PACKAGENAME) is 
available to be reinstalled
+       @test -d $(packagesdir)/$(PACKAGENAME) && \
+               echo -e "[$(OK)reinstall-p$(OFF)] $(MSG)$(PACKAGENAME) is 
available to be reinstalled$(OFF)"
 
 reinstall: $(addprefix dep-$(GARDIR)/,$(LIBDEPS)) $(addprefix 
sysinstall-,$(filter-out $(SYSINSTALL_IGNORE),$(SYSINSTALL_TARGETS)))