[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[lmi-commits] [lmi] odd/fixups 953b23e 3/4: cp slash dot, not slash aste
|
From: |
Greg Chicares |
|
Subject: |
[lmi-commits] [lmi] odd/fixups 953b23e 3/4: cp slash dot, not slash asterisk |
|
Date: |
Mon, 6 May 2019 19:06:59 -0400 (EDT) |
branch: odd/fixups
commit 953b23ea5ec5dcf96b76e58d884101ba0d18ef86
Author: Gregory W. Chicares <address@hidden>
Commit: Gregory W. Chicares <address@hidden>
cp slash dot, not slash asterisk
See the immediately preceding commit message.
---
GNUmakefile | 2 +-
README.schroot | 6 +++---
gwc/develop0.txt | 12 ++++++------
install_miscellanea.make | 14 +++++++-------
install_msw.sh | 2 +-
5 files changed, 18 insertions(+), 18 deletions(-)
diff --git a/GNUmakefile b/GNUmakefile
index 0c517c7..5b2cfcb 100644
--- a/GNUmakefile
+++ b/GNUmakefile
@@ -421,7 +421,7 @@ check_concinnity: source_clean custom_tools
| $(MD5SUM) --check --quiet || true
@for z in $(build_dir)/*.d; do [ -s $$z ] || echo $$z; done;
@for z in $(build_dir)/*.o; do [ -f $${z%%.o}.d ] || echo $$z; done;
- @$(LS) --classify ./* \
+ @$(LS) --classify ./. \
| $(SED) -e'/\*$$/!d' -e'/^\.\//!d' -e'/.sh\*$$/d' -e'/.sed\*$$/d' \
| $(SED) -e's/^/Improperly executable: /'
@$(ECHO) " Problems detected by xmllint:"
diff --git a/README.schroot b/README.schroot
index 3211add..b1ff4ff 100644
--- a/README.schroot
+++ b/README.schroot
@@ -231,7 +231,7 @@ exit
# /srv/chroot/some-prior-chroot/opt/lmi/blessed/ /srv/cache_for_lmi
# to update the host, and then:
# cp --dereference --preserve --recursive \
-# /srv/cache_for_lmi/* /srv/chroot/lmi-buster2/cache_for_lmi/
+# /srv/cache_for_lmi/. /srv/chroot/lmi-buster2/cache_for_lmi/
#
# Also copy any desired msw software into the chroot now, e.g.:
# cp -a /srv/chroot/some-prior-chroot/opt/xyzzy
/srv/chroot/lmi-buster2/opt/xyzzy
@@ -362,7 +362,7 @@ cp -a /opt/lmi/proprietary/src /opt/lmi/src/products
# ...and the directories for system testing:
cp -a /opt/lmi/proprietary/test /opt/lmi
mkdir --parents /opt/lmi/touchstone
-cp -a /opt/lmi/proprietary/test/* /opt/lmi/touchstone/
+cp -a /opt/lmi/proprietary/test/. /opt/lmi/touchstone/
# Remove object files previously built without proprietary source:
rm /opt/lmi/src/build/lmi/Linux/gcc/ship/my*
@@ -378,7 +378,7 @@ cd /opt/lmi/src/lmi
make $coefficiency system_test 2>&1 |less -S
# That test fails the first time because no results are saved in
# touchstone/ yet. Copy the results just generated...
-cp -a /opt/lmi/test/* /opt/lmi/touchstone
+cp -a /opt/lmi/test/. /opt/lmi/touchstone
# ...removing summaries...
rm /opt/lmi/touchstone/analysis* /opt/lmi/touchstone/diffs*
/opt/lmi/touchstone/md5sum*
# ...and rerun the test, which should now succeed:
diff --git a/gwc/develop0.txt b/gwc/develop0.txt
index 8b91f41..7853252 100644
--- a/gwc/develop0.txt
+++ b/gwc/develop0.txt
@@ -101,8 +101,8 @@ ssh-keygen -t rsa -b 4096 -C "address@hidden"
# Check permissions; make sure they're not too open
chown -R `whoami` ~/.ssh
-chmod 600 ~/.ssh/*
-stat --format=%a%n ~/.ssh/*
+chmod 600 ~/.ssh/.
+stat --format=%a%n ~/.ssh/.
# All those files should have '600' permissions
@@ -192,20 +192,20 @@ git clone address@hidden:/srv/git/lmi.git
# contents: most recent archive, or proprietary repo
mkdir --parents /opt/lmi/test
-cp --preserve /archive/lmi/testdecks/* /opt/lmi/test
+cp --preserve /archive/lmi/testdecks/. /opt/lmi/test
# contents: verifiable with shared 'md5sums'
mkdir --parents /opt/lmi/touchstone
-cp --preserve /archive/lmi/touchstone/* /opt/lmi/touchstone
+cp --preserve /archive/lmi/touchstone/. /opt/lmi/touchstone
# Copy proprietary products
# contents: most recent archive, or proprietary repo
mkdir --parents /lmi/src/products/src
-cp --preserve /archive/lmi/src/products/src/* /lmi/src/products/src
+cp --preserve /archive/lmi/src/products/src/. /lmi/src/products/src
# 'install_msw.sh' already created the target directory
#
# contents: any '.dat' or '.ndx' file missing or differing from
# 'lmi-data*' in lmi's ftp area
-cp --preserve /archive/lmi/data/* /opt/lmi/data
+cp --preserve /archive/lmi/data/. /opt/lmi/data
diff --git a/install_miscellanea.make b/install_miscellanea.make
index b6f6ee9..2d4fab4 100644
--- a/install_miscellanea.make
+++ b/install_miscellanea.make
@@ -166,9 +166,9 @@ all: boost cgicc jing md5sum_msw sample trang xmlwrapp
boost: $(file_list)
-[ -e $(stem).patch ] && $(PATCH) --directory=$(ad_hoc_dir) --strip=1 <
$(stem).patch
$(MKDIR) $(third_party_include_dir)/boost/
- $(CP) --force --preserve --recursive $(ad_hoc_dir)/$(stem)/boost/*
$(third_party_include_dir)/boost/
+ $(CP) --force --preserve --recursive $(ad_hoc_dir)/$(stem)/boost/.
$(third_party_include_dir)/boost/
$(MKDIR) $(third_party_source_dir)/boost/
- $(MV) $(ad_hoc_dir)/$(stem)/*
$(third_party_source_dir)/boost/
+ $(MV) $(ad_hoc_dir)/$(stem)/.
$(third_party_source_dir)/boost/
.PHONY: cgicc
cgicc: $(file_list)
@@ -177,7 +177,7 @@ cgicc: $(file_list)
$(MV) $(ad_hoc_dir)/$(stem)/cgicc/*.h
$(third_party_include_dir)/cgicc/
$(MKDIR) $(third_party_source_dir)/cgicc
$(MV) $(ad_hoc_dir)/$(stem)/cgicc/*.cpp $(third_party_source_dir)/cgicc/
- cd $(dest_dir) && $(MD5SUM) --binary include/cgicc/* src/cgicc/*
>$(stem).md5sums
+ cd $(dest_dir) && $(MD5SUM) --binary include/cgicc/. src/cgicc/.
>$(stem).md5sums
cd $(dest_dir) && $(MD5SUM) --check $(CURDIR)/$(stem).md5sums
$(SORT) --key=2 --output=$(stem).X $(stem).md5sums
$(SORT) --key=2 --output=$(stem).Y $(dest_dir)/$(stem).md5sums
@@ -218,7 +218,7 @@ md5sum_msw: $(file_list)
.PHONY: sample
sample: $(file_list)
-$(MKDIR) --parents $(prefix)/data
- $(MV) $(ad_hoc_dir)/$(stem)/* $(prefix)/data
+ $(MV) $(ad_hoc_dir)/$(stem)/. $(prefix)/data
.PHONY: trang
trang: $(file_list)
@@ -233,10 +233,10 @@ xmlwrapp: $(file_list)
$(MKDIR) $(third_party_include_dir)/xsltwrapp/
$(MV) $(ad_hoc_dir)/$(stem)/include/xsltwrapp/*.h
$(third_party_include_dir)/xsltwrapp/
$(MKDIR) $(third_party_source_dir)/libxml/
- $(MV) $(ad_hoc_dir)/$(stem)/src/libxml/*
$(third_party_source_dir)/libxml/
+ $(MV) $(ad_hoc_dir)/$(stem)/src/libxml/.
$(third_party_source_dir)/libxml/
$(MKDIR) $(third_party_source_dir)/libxslt/
- $(MV) $(ad_hoc_dir)/$(stem)/src/libxslt/*
$(third_party_source_dir)/libxslt/
- cd $(dest_dir) && $(MD5SUM) --binary include/xmlwrapp/*
include/xsltwrapp/* src/libxml/* src/libxslt/* >$(stem).md5sums
+ $(MV) $(ad_hoc_dir)/$(stem)/src/libxslt/.
$(third_party_source_dir)/libxslt/
+ cd $(dest_dir) && $(MD5SUM) --binary include/xmlwrapp/.
include/xsltwrapp/. src/libxml/. src/libxslt/. >$(stem).md5sums
cd $(dest_dir) && $(MD5SUM) --check $(CURDIR)/$(stem).md5sums
$(SORT) --key=2 --output=$(stem).X $(stem).md5sums
$(SORT) --key=2 --output=$(stem).Y $(dest_dir)/$(stem).md5sums
diff --git a/install_msw.sh b/install_msw.sh
index 5463f67..69d96c7 100755
--- a/install_msw.sh
+++ b/install_msw.sh
@@ -220,7 +220,7 @@ do
if [ "Cygwin" = "$platform" ]
then
# No lmi binary should depend on any Cygwin library.
- for z in /opt/lmi/bin/* ;
+ for z in /opt/lmi/bin/. ;
do cmd /c "$CYGCHECK $z" 2>&1 | grep --silent cygwin \
&& printf '\ncygcheck %s\n' "$z" && cmd /c "$CYGCHECK $z" ;
done