[Gsrc-commit] trunk r8830: some script fixes

[Carl Hansen]

------------------------------------------------------------
revno: 8830
revision-id: carlhansen1234@gmail.com-20221129083439-djxzetuyopyufxpg
parent: carlhansen1234@gmail.com-20221129082959-15tqutn3k6tz2net
committer: carlhansen1234@gmail.com
branch nick: trunk
timestamp: Tue 2022-11-29 00:34:39 -0800
message:
  some script fixes
modified:
  gar/gar.lib.mk                 gar.lib.mk-20160617013741-ul4q527k85thcz4p-1
  gar/gar.mk                     gar.mk-20160617013745-r4h3dj0kiuppihsx-1

=== modified file 'gar/gar.lib.mk'
--- a/gar/gar.lib.mk    2022-11-10 05:24:02 +0000
+++ b/gar/gar.lib.mk    2022-11-29 08:34:39 +0000
@@ -713,6 +713,8 @@
 packagesysconfdir = $(packageDESTDIR)$(sysconfdir)
 packagevardir     = $(packageDESTDIR)$(vardir)
 packagedocs       = $(packageprefix)/share/doc/$(strip $(GARNAME))
+
+# FIXME fix other palce NORMALIZE
 packageexamples   = $(packageprefix)/share/doc/$(strip $(GARNAME))/examples
 
 #was packageexamples   = $(packageprefix)/share/examples/$(strip $(GARNAME))
@@ -731,25 +733,30 @@
     $(CREATED_MERGE_DIRS) \
     root /
 
+
+
 prepare-install:
-       @printf "[$(OK)prepare-install$(OFF)] $(MSG)Preparing staging 
area$(OFF)\n"
+       @printf "[$(OK)prepare-install$(OFF)] $(MSG)Preparing staging area 
DESTDIR...$(OFF)\n"
        rm -fr $(packageDESTDIR)
        mkdir -p $(packageDESTDIR)$(prefix)
        @set -e; \
         set -- $(CREATED_MERGE_DIRS); \
+               echo $$1 $$src; \
         while [ "$$1" != "" ]; do \
             echo echoing.... 1  $$1 and 2 $$2; \
             src=$(packagedotgardir)/$$1; \
             dest=$(packageDESTDIR)$$2; \
-            echo  echoing .... mkdir -p $$src `dirname $$dest`; \
+                       echo $$src ; \
+                       echo $$dest ; \
+                       echo  echoing .... mkdir -p $$src `dirname $$dest`; \
             mkdir -p $$src `dirname $$dest`; \
             rm -f $$dest; \
             ln -sf $$src $$dest; \
             shift; shift; \
         done $(OUTPUT)
 
-finish-package-install:
-       @printf "[$(OK)finish-package-install$(OFF)] $(MSG)Moving files from 
staging area to packages$(OFF)\n"
+finish-package-install: 
+       @printf "[$(OK)finish-package-install$(OFF)] $(MSG)Moving files from 
staging area DESTDIR to packages$(OFF)\n"
        @set -e; \
         set -- $(CREATED_MERGE_DIRS); \
         while [ "$$1" != "" ]; do \
@@ -759,8 +766,10 @@
             shift; shift; \
         done $(OUTPUT)
        rm -rvf $(packagedir) $(OUTPUT)
-       mv $(packageDESTDIR)$(prefix) $(packagedir)
+       echo note
+       cp -a $(packageDESTDIR)$(prefix) $(packagedir)
        rm -rvf $(packageDESTDIR) $(OUTPUT)
+       
 
 GNU_INSTALL_ARGS = \
     prefix=$(packageprefix) \
@@ -773,19 +782,19 @@
 
 # Use "make install" with prefix-changing.
 install-%/Makefile install-%/makefile install-%/GNUmakefile:
-       @printf "[$(OK)install in $* $(OFF)] $(MSG)Running make 
$(INSTALL_TARGET) in $(OFF)$*\n"
+       @printf "[$(OK)install in $* $(OFF)] $(MSG)Running make 
$(INSTALL_TARGET) from $(OFF)$*\n"
        $(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(INSTALL_ARGS) 
$(INSTALL_TARGET) $(OUTPUT)
        $(MAKECOOKIE)
 
 # Use "make install" with DESTDIR.
 DESTDIR_INSTALL_ARGS ?=
 install-%/Makefile-DESTDIR:
-       @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) with 
DESTDIR in $(OFF)$*\n"
+       @printf "[$(OK)install$(OFF)] $(MSG)Running make $(INSTALL_TARGET) to 
DESTDIR from $(OFF)$*\n"
        $(INSTALL_ENV) $(MAKE) -C $* $(MAKE_ARGS) $(DESTDIR_INSTALL_ARGS) 
$(INSTALL_TARGET) DESTDIR=$(packageDESTDIR) $(OUTPUT)
        $(MAKECOOKIE)
 
 install-%/Makefile-BSD:
-       @printf "[$(OK)install in $* w pmake$(OFF)] $(MSG)Running pmake 
$(INSTALL_TARGET) in $(OFF)$*\n"
+       @printf "[$(OK)install in $* w pmake$(OFF)] $(MSG)Running pmake 
$(INSTALL_TARGET) from $(OFF)$*\n"
        cd $* && $(INSTALL_ENV) pmake $(INSTALL_ARGS) $(INSTALL_TARGET) 
$(OUTPUT)
        $(MAKECOOKIE)
 
@@ -1092,11 +1101,11 @@
 # carl ls ? backtick or $sheel
 #
 sysinstall-check:
-       @printf "[$(OK)sysinstall-check$(OFF)] $(MSG)Checking status of DESTDIR 
staging install$(OFF)\n"
+       @printf "[$(OK)sysinstall-check$(OFF)] $(MSG)Checking status of 
packages $(packagedir) staging install$(OFF)\n"
        @if [ "`ls $(packagedir)`" ]; then \
-        printf "[$(OK)sysinstall-check$(OFF)] $(MSG)Successful DESTDIR 
$(packagedir)  install$(OFF)\n"; \
+        printf "[$(OK)sysinstall-check$(OFF)] $(MSG)Successful  $(packagedir) 
ready$(OFF)\n"; \
     else \
-        printf "[$(ERR)sysinstall-check$(OFF)] $(MSG)DESTDIR $(packagedir) 
install failed, uninstalling$(OFF)\n"; \
+        printf "[$(ERR)sysinstall-check$(OFF)] $(MSG) $(packagedir) install 
failed, uninstalling$(OFF)\n"; \
         $(MAKE) -C $(WORKOBJ) uninstall $(OUTPUT); \
         exit 1; \
     fi
@@ -1109,7 +1118,7 @@
        $(MAKECOOKIE)
 
 sysinstall-normalise:
-       @printf "[$(OK)sysinstall-normalise$(OFF)] $(MSG)Normalising directory 
layout in staging$(OFF)\n"
+       @printf "[$(OK)sysinstall-normalise$(OFF)] $(MSG)Normalising directory 
layout in packages staging$(OFF)\n"
        @set -e; \
     normalise () { \
         rmdir $$1 2>/dev/null || true; \
@@ -1126,11 +1135,12 @@
     normalise $(packagedir)/examples $(packagedir)/share/doc/examples; \
     normalise $(packagedir)/games $(packagedir)/bin  $(OUTPUT)
        $(MAKECOOKIE)
+#examples wrong... FIXME
 
 sysinstall-packagevars:
        @printf "[$(OK)sysinstall-packagevars$(OFF)] $(MSG)Writing package 
metadata FILES DIRS BUILD$(OFF)\n"
-       @test -d $(dotgardir) || mkdir -p $(dotgardir);
-       @(cd $(packagedir) \
+       test -d $(dotgardir) || mkdir -p $(dotgardir);
+       (cd $(packagedir) \
        && find . -not -type d -print > $(dotgardir)/FILES \
        && find . -mindepth 2 -depth -type d -print > $(dotgardir)/DIRS ) \
         || $(SYSINSTALL_FAIL)
@@ -1139,12 +1149,12 @@
 SYSINSTALL_FAIL = (rm -f $(packagesdir)/$(strip $(GARNAME)) 
$(COOKIEDIR)/sysinstall-*; false)
 
 sysinstall-install:
-       @printf "[$(OK)sysinstall-install$(OFF)] $(MSG)Stowing to packages 
$(OFF)\n"
+       @printf "[$(OK)sysinstall-install$(OFF)] $(MSG)Stowing from packages to 
working directories $(OFF)\n"
        (cp -r -v -f --symbolic-link --target-directory=$(prefix) 
$(packagedir)/* $(OUTPUT) && \
         ln -n -v -f -s $(PACKAGENAME) $(dotgardir)/VERSION $(OUTPUT)) || 
$(SYSINSTALL_FAIL) $(OUTPUT)
 
 sysinstall-uninstall:
-       @printf "[$(OK)sysinstall-uninstall$(OFF)] $(MSG)Unstowing from 
packages $(OFF)\n"
+       @printf "[$(OK)sysinstall-uninstall$(OFF)] $(MSG)Unstowing from working 
directories $(OFF)\n"
        rm -f $(COOKIEDIR)/sysinstall-*
        (test -d $(dotgardir) || (printf "[$(ERR)sysinstall-uninstall$(OFF)] 
$(MSG)$(GARNAME) is not installed$(OFF)\n" && exit 1)) && \
        ( cd $(prefix) ; \

=== modified file 'gar/gar.mk'
--- a/gar/gar.mk        2022-11-05 08:29:17 +0000
+++ b/gar/gar.mk        2022-11-29 08:34:39 +0000
@@ -364,7 +364,7 @@
 uninstall: pre-uninstall custom-pre-uninstall sysinstall-uninstall 
post-uninstall custom-post-uninstall
        $(DONADA)
 
-uninstall-pkg: sysinstall-uninstall-pkg uninstall
+uninstall-pkg: sysinstall-uninstall-pkg 
        $(DONADA)
 
 uninstall-pkg-old: