[Git][xorg-team/xserver/xorg-server][debian-unstable] 3 commits: debian/local/xvfb-run: Fix use of deprecated tempfile utility

[Julien Cristau <jcristau@debian.org>]

Title: GitLab

Julien Cristau pushed to branch debian-unstable at X Strike Force / xserver / xorg-server

Commits:

• fdabbaca
  by Eli Schwartz at 2018-07-03T11:46:23+02:00

  debian/local/xvfb-run: Fix use of deprecated tempfile utility
  
  tempfile is pretty well guaranteed to not be available on other
  distributions, and continuing to use it over mktemp just encourages bad
  scripting practices.
  
  It was unnecessary here anyway as the parent directory was already
  securely created and it was only being used to combine file creation and
  variable assignment in one command (by taking advantage of the fact that
  tempfile, when given a hardcoded filename, will also print the same
  filename back to you). It makes much more sense to simply set the
  variable, and `touch` the file separately.
  

• 72da781e
  by Eli Schwartz at 2018-07-03T11:46:28+02:00

  debian/local/xvfb-run: Use builtin `case` to test variable value, rather than external `expr`
  
  This is both faster and more pretty. Because case statements are just
  that awesome.
  

• 819b2f0c
  by Julien Cristau at 2018-07-03T11:52:45+02:00

  xvfb-run: use "command -v" rather than "which"
  
  Using a shell builtin is preferable to an external command, and "which"
  may not be available on some systems such as Arch Linux.
  
  This is not currently strictly conformant with Debian policy as "command
  -v" is not part of SUSv3, but policy is in the process of being updated,
  see bug#864615.
  
  Debian bug#889676
  

1 changed file:

• debian/local/xvfb-run

Changes:

debian/local/xvfb-run

---

...	...	@@ -22,9 +22,9 @@ XAUTHPROTO=.
22	22	# the COLUMNS variable is not set. ($COLUMNS can react to SIGWINCH while the
23	23	# script is running, and this cannot, only being calculated once.)
24	24	DEFCOLUMNS=$(stty size 2>/dev/null | awk '{print $2}') || true
25		-if ! expr "$DEFCOLUMNS" : "[[:digit:]]\+$" >/dev/null 2>&1; then
26		- DEFCOLUMNS=80
27		-fi
	25	+case "$DEFCOLUMNS" in
	26	+ *[!0-9]*|'') DEFCOLUMNS=80 ;;
	27	+esac
28	28
29	29	# Display a message, wrapping lines at the terminal width.
30	30	message () {
...	...	@@ -134,7 +134,7 @@ if [ -z "$*" ]; then
134	134	exit 2
135	135	fi
136	136
137		-if ! which xauth >/dev/null; then
	137	+if ! command -v xauth >/dev/null; then
138	138	error "xauth command not found"
139	139	exit 3
140	140	fi
...	...	@@ -146,8 +146,9 @@ trap clean_up EXIT
146	146	# directory to house one.
147	147	if [ -z "$AUTHFILE" ]; then
148	148	XVFB_RUN_TMPDIR="$(mktemp -d -t $PROGNAME.XXXXXX)"
	149	+ AUTHFILE="$XVFB_RUN_TMPDIR/Xauthority"
149	150	# Create empty file to avoid xauth warning
150		- AUTHFILE=$(tempfile -n "$XVFB_RUN_TMPDIR/Xauthority")
	151	+ touch "$AUTHFILE"
151	152	fi
152	153
153	154	# Start Xvfb.

—
View it on GitLab.
You're receiving this email because of your account on salsa.debian.org. If you'd like to receive fewer emails, you can adjust your notification settings.