From a9111d8670b48f473e968a0e75d83782dbf74425 Mon Sep 17 00:00:00 2001 From: Stefan Kangas Date: Wed, 19 Oct 2022 13:26:54 +0200 Subject: [PATCH] Add admin/emacs-shell-lib for shared bash code * admin/emacs-shell-lib: New file for shared bash code. * admin/automerge: * admin/diff-tar-files: * admin/emacs-shell-lib: * admin/make-manuals: * admin/update_autogen: * admin/upload-manuals: Simplify and improve using above new library. --- admin/automerge | 23 +----------- admin/diff-tar-files | 8 ++-- admin/emacs-shell-lib | 87 +++++++++++++++++++++++++++++++++++++++++++ admin/make-manuals | 13 +------ admin/update_autogen | 20 +--------- admin/upload-manuals | 10 +---- 6 files changed, 98 insertions(+), 63 deletions(-) create mode 100644 admin/emacs-shell-lib diff --git a/admin/automerge b/admin/automerge index c7c17dfb5ec..d2c92948e17 100755 --- a/admin/automerge +++ b/admin/automerge @@ -35,18 +35,7 @@ ## it with the -d option in the repository directory, in case a pull ## updates this script while it is working. -set -o nounset - -die () # write error to stderr and exit -{ - [ $# -gt 0 ] && echo "$PN: $*" >&2 - exit 1 -} - -PN=${0##*/} # basename of script -PD=${0%/*} - -[ "$PD" = "$0" ] && PD=. # if PATH includes PWD +source "${0%/*}/emacs-shell-lib" usage () { @@ -129,13 +118,7 @@ OPTIND=1 [ "$test" ] && build=1 -if [ -x "$(command -v mktemp)" ]; then - tempfile=$(mktemp "/tmp/$PN.XXXXXXXXXX") -else - tempfile=/tmp/$PN.$$ -fi - -trap 'rm -f $tempfile 2> /dev/null' EXIT +tempfile="$(emacs_mktemp)" [ -e Makefile ] && [ "$build" ] && { @@ -263,5 +246,3 @@ git push || die "push error" exit 0 - -### automerge ends here diff --git a/admin/diff-tar-files b/admin/diff-tar-files index 6ab39eab2f5..869c9421502 100755 --- a/admin/diff-tar-files +++ b/admin/diff-tar-files @@ -1,4 +1,4 @@ -#! /bin/sh +#!/bin/bash # Copyright (C) 2001-2022 Free Software Foundation, Inc. @@ -17,6 +17,7 @@ # You should have received a copy of the GNU General Public License # along with GNU Emacs. If not, see . +source "${0%/*}/emacs-shell-lib" if [ $# != 2 ]; then cat < $old_tmp tar tf "$new_tar" | sed -e 's,^[^/]*,,' | sort > $new_tmp diff --git a/admin/emacs-shell-lib b/admin/emacs-shell-lib new file mode 100644 index 00000000000..750f81e0577 --- /dev/null +++ b/admin/emacs-shell-lib @@ -0,0 +1,87 @@ +#!/bin/bash +### emacs-shell-lib - shared code for Emacs shell scripts + +## Copyright (C) 2022 Free Software Foundation, Inc. + +## Author: Stefan Kangas + +## This file is part of GNU Emacs. + +## GNU Emacs is free software: you can redistribute it and/or modify +## it under the terms of the GNU General Public License as published by +## the Free Software Foundation, either version 3 of the License, or +## (at your option) any later version. + +## GNU Emacs is distributed in the hope that it will be useful, +## but WITHOUT ANY WARRANTY; without even the implied warranty of +## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +## GNU General Public License for more details. + +## You should have received a copy of the GNU General Public License +## along with GNU Emacs. If not, see . + +### Code: + +# Set an explicit umask. +umask 077 + +# Treat unset variables as an error. +set -o nounset + +# Exit immediately on error. +set -o errexit + +# Avoid non-standard command output from non-C locales. +unset LANG LC_ALL LC_MESSAGES + +PN=${0##*/} # basename of script +PD=${0%/*} # script directory + +[ "$PD" = "$0" ] && PD=. # if PATH includes PWD + +die () # write error to stderr and exit +{ + [ $# -gt 0 ] && echo "$PN: $@" >&2 + exit 1 +} + +emacs_tempfiles=() + +emacs_tempfiles_cleanup () +{ + for file in ${emacs_tempfiles[@]}; do + rm -f "${file}" 2> /dev/null + done +} + +trap ' + ret=$? + emacs_tempfiles_cleanup + exit $ret +' EXIT + +emacs_mktemp () +{ + local readonly file="${1-}" + local tempfile + local prefix + + if [ -z "$file" ]; then + prefix="$PN" + else + prefix="$1" + fi + + if [ -x "$(command -v mktemp)" ]; then + tempfile=$(mktemp "${TMPDIR-/tmp}/${prefix}.XXXXXXXXXX") + else + tempfile="${TMPDIR-/tmp}/${prefix}.$RANDOM$$" + (umask 077 && touch "$tempfile") + fi + + [ -z "${tempfile}" ] && die "Creating temporary file failed" + + emacs_tempfiles+=("${tempfile}") + + echo "$tempfile" +} diff --git a/admin/make-manuals b/admin/make-manuals index cb0c00a423f..a252bf20f1e 100755 --- a/admin/make-manuals +++ b/admin/make-manuals @@ -33,15 +33,7 @@ ### Code: -set -o nounset - -die () # write error to stderr and exit -{ - [ $# -gt 0 ] && echo "$PN: $@" >&2 - exit 1 -} - -PN=${0##*/} # basename of script +source "${0%/*}/emacs-shell-lib" usage () { @@ -96,8 +88,7 @@ OPTIND=1 [ -e admin/admin.el ] || die "admin/admin.el not found" -tempfile=/tmp/$PN.$$ -trap "rm -f $tempfile 2> /dev/null" EXIT +tempfile="$(emacs_mktemp)" [ "$continue" ] || rm -rf $outdir diff --git a/admin/update_autogen b/admin/update_autogen index d1f49d9f25e..55e11be95c7 100755 --- a/admin/update_autogen +++ b/admin/update_autogen @@ -32,18 +32,7 @@ ### Code: -set -o nounset - -die () # write error to stderr and exit -{ - [ $# -gt 0 ] && echo "$PN: $@" >&2 - exit 1 -} - -PN=${0##*/} # basename of script -PD=${0%/*} - -[ "$PD" = "$0" ] && PD=. # if PATH includes PWD +source "${0%/*}/emacs-shell-lib" ## This should be the admin directory. cd $PD || exit @@ -102,10 +91,7 @@ done [ "$basegen" ] || die "internal error" -tempfile=/tmp/$PN.$$ - -trap 'rm -f $tempfile 2> /dev/null' EXIT - +tempfile="$(emacs_mktemp)" while getopts ":hcfqA:CL" option ; do case $option in @@ -312,5 +298,3 @@ commit "loaddefs" $modified || die "commit error" exit 0 - -### update_autogen ends here diff --git a/admin/upload-manuals b/admin/upload-manuals index 50336ee64c0..04f7c3acc72 100755 --- a/admin/upload-manuals +++ b/admin/upload-manuals @@ -36,15 +36,7 @@ ### Code: -set -o nounset - -die () # write error to stderr and exit -{ - [ $# -gt 0 ] && echo "$PN: $@" >&2 - exit 1 -} - -PN=${0##*/} # basename of script +source "${0%/*}/emacs-shell-lib" usage () { -- 2.39.5