Commit 891bc982 authored by Paul Eggert's avatar Paul Eggert

Port /bin/sh scripts to Solaris 10

Its /bin/sh builtin ‘test’ command does not support -e.
* autogen.sh, build-aux/git-hooks/pre-commit:
* build-aux/gitlog-to-emacslog, make-dist:
Use test -r, not test -e.
parent 80fccd42
...@@ -115,7 +115,7 @@ for arg; do ...@@ -115,7 +115,7 @@ for arg; do
do_check=false;; do_check=false;;
all) all)
do_autoconf=true do_autoconf=true
test -e .git && do_git=true;; test -r .git && do_git=true;;
autoconf) autoconf)
do_autoconf=true;; do_autoconf=true;;
git) git)
...@@ -128,7 +128,7 @@ done ...@@ -128,7 +128,7 @@ done
case $do_autoconf,$do_git in case $do_autoconf,$do_git in
false,false) false,false)
do_autoconf=true do_autoconf=true
test -e .git && do_git=true;; test -r .git && do_git=true;;
esac esac
# Generate Autoconf-related files, if requested. # Generate Autoconf-related files, if requested.
...@@ -294,7 +294,7 @@ git_config () ...@@ -294,7 +294,7 @@ git_config ()
# Get location of Git's common configuration directory. For older Git # Get location of Git's common configuration directory. For older Git
# versions this is just '.git'. Newer Git versions support worktrees. # versions this is just '.git'. Newer Git versions support worktrees.
{ test -e .git && { test -r .git &&
git_common_dir=`git rev-parse --no-flags --git-common-dir 2>/dev/null` && git_common_dir=`git rev-parse --no-flags --git-common-dir 2>/dev/null` &&
test -n "$git_common_dir" test -n "$git_common_dir"
} || git_common_dir=.git } || git_common_dir=.git
...@@ -377,7 +377,7 @@ fi ...@@ -377,7 +377,7 @@ fi
if test ! -f configure; then if test ! -f configure; then
echo "You can now run '$0 autoconf'." echo "You can now run '$0 autoconf'."
elif test -e .git && test $git_was_ok = false && test $do_git = false; then elif test -r .git && test $git_was_ok = false && test $do_git = false; then
echo "You can now run '$0 git'." echo "You can now run '$0 git'."
elif test ! -f config.status || elif test ! -f config.status ||
test -n "`find configure src/config.in -newer config.status`"; then test -n "`find configure src/config.in -newer config.status`"; then
......
...@@ -28,7 +28,7 @@ exec >&2 ...@@ -28,7 +28,7 @@ exec >&2
# When doing a two-way merge, ignore problems that came from the other # When doing a two-way merge, ignore problems that came from the other
# side of the merge. # side of the merge.
head=HEAD head=HEAD
if test -e "$GIT_DIR"/MERGE_HEAD; then if test -r "$GIT_DIR"/MERGE_HEAD; then
merge_heads=`cat "$GIT_DIR"/MERGE_HEAD` || exit merge_heads=`cat "$GIT_DIR"/MERGE_HEAD` || exit
for merge_head in $merge_heads; do for merge_head in $merge_heads; do
case $head in case $head in
......
...@@ -68,7 +68,7 @@ if [ -f "$output" ]; then ...@@ -68,7 +68,7 @@ if [ -f "$output" ]; then
fi fi
# If this is not a Git repository, just generate an empty ChangeLog. # If this is not a Git repository, just generate an empty ChangeLog.
test -e .git || { test -r .git || {
>"$output" >"$output"
exit exit
} }
...@@ -81,7 +81,7 @@ test -e .git || { ...@@ -81,7 +81,7 @@ test -e .git || {
--ignore-line='^; ' --format='%B' \ --ignore-line='^; ' --format='%B' \
"$gen_origin..$new_origin" >"ChangeLog.tmp" || exit "$gen_origin..$new_origin" >"ChangeLog.tmp" || exit
if test -e "ChangeLog.tmp"; then if test -r "ChangeLog.tmp"; then
# Fix up bug references. # Fix up bug references.
# This would be better as eg a --transform option to gitlog-to-changelog, # This would be better as eg a --transform option to gitlog-to-changelog,
......
...@@ -240,7 +240,7 @@ if [ $check = yes ]; then ...@@ -240,7 +240,7 @@ if [ $check = yes ]; then
bogosities= bogosities=
while read elc; do while read elc; do
el=`echo $elc | sed 's/c$//'` el=`echo $elc | sed 's/c$//'`
[ -e $el ] || continue [ -r $el ] || continue
[ $elc -nt $el ] || bogosities="$bogosities $elc" [ $elc -nt $el ] || bogosities="$bogosities $elc"
done < /tmp/elc done < /tmp/elc
...@@ -278,7 +278,7 @@ if [ $check = yes ]; then ...@@ -278,7 +278,7 @@ if [ $check = yes ]; then
info=`sed -n 's/^@setfilename //p' $texi | sed 's|.*info/||'` info=`sed -n 's/^@setfilename //p' $texi | sed 's|.*info/||'`
[ x"${info}" != x"" ] || continue [ x"${info}" != x"" ] || continue
info=info/$info info=info/$info
[ -e $info ] || continue [ -r $info ] || continue
[ $info -nt $texi ] || bogosities="$bogosities $info" [ $info -nt $texi ] || bogosities="$bogosities $info"
done < /tmp/el done < /tmp/el
...@@ -292,7 +292,7 @@ if [ $check = yes ]; then ...@@ -292,7 +292,7 @@ if [ $check = yes ]; then
## This exits with non-zero status if any .info files need ## This exits with non-zero status if any .info files need
## rebuilding. ## rebuilding.
if [ -e Makefile ]; then if [ -r Makefile ]; then
echo "Checking to see if info files are up-to-date..." echo "Checking to see if info files are up-to-date..."
make --question info || error=yes make --question info || error=yes
fi fi
...@@ -300,7 +300,7 @@ if [ $check = yes ]; then ...@@ -300,7 +300,7 @@ if [ $check = yes ]; then
## Is this a release? ## Is this a release?
case $version in case $version in
[1-9][0-9].[0-9]) [1-9][0-9].[0-9])
if [ -e ChangeLog ]; then if [ -r ChangeLog ]; then
if ! grep -q "Version $version released" ChangeLog; then if ! grep -q "Version $version released" ChangeLog; then
echo "No release notice in ChangeLog" echo "No release notice in ChangeLog"
error=yes error=yes
...@@ -359,10 +359,10 @@ echo "Creating top directory: '${tempdir}'" ...@@ -359,10 +359,10 @@ echo "Creating top directory: '${tempdir}'"
mkdir ${tempdir} mkdir ${tempdir}
if [ "$changelog" = yes ]; then if [ "$changelog" = yes ]; then
if test -e .git; then if test -r .git; then
## When making a release or pretest the ChangeLog should already ## When making a release or pretest the ChangeLog should already
## have been created and edited as needed. Don't ignore it. ## have been created and edited as needed. Don't ignore it.
if test -e ChangeLog; then if test -r ChangeLog; then
echo "Using existing top-level ChangeLog" echo "Using existing top-level ChangeLog"
else else
echo "Making top-level ChangeLog" echo "Making top-level ChangeLog"
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment