From e5a44a94b61a0dfc9a1366e64a29b46d6b372b7b Mon Sep 17 00:00:00 2001 From: Doug Luce Date: Tue, 21 May 2024 18:16:03 -0700 Subject: [PATCH] Make instructions work on more platforms The `--sort` argument to ls is a linuxism (more precisely a gnu-coreutilsism). I get this output when attempting these instructions on FreeBSD (13): $ diff -u "$(ls --sort=t | head -2 | tail -1)/config/production.yaml.example" "$(ls --sort=t | head -1)/config/production.yaml.example" ls: unrecognized option `--sort=t' usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuvwxy1,] [--color=when] [-D format] [file ...] ls: unrecognized option `--sort=t' usage: ls [-ABCFGHILPRSTUWZabcdfghiklmnopqrstuvwxy1,] [--color=when] [-D format] [file ...] diff: /config/production.yaml.example: No such file or directory Changing `--sort=t` to the POSIX-compliant `-t` makes this work as expected and operates just fine on Linux (tested on Fedora Linux 39). Fixes #6412 --- support/doc/production.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/support/doc/production.md b/support/doc/production.md index 8a2338e8b..e1591b9f2 100644 --- a/support/doc/production.md +++ b/support/doc/production.md @@ -361,7 +361,7 @@ Check for configuration changes, and report them in your `config/production.yaml ```bash cd /var/www/peertube/versions -diff -u "$(ls --sort=t | head -2 | tail -1)/config/production.yaml.example" "$(ls --sort=t | head -1)/config/production.yaml.example" +diff -u "$(ls -t | head -2 | tail -1)/config/production.yaml.example" "$(ls -t | head -1)/config/production.yaml.example" ``` ### Update nginx configuration @@ -370,7 +370,7 @@ Check changes in nginx configuration: ```bash cd /var/www/peertube/versions -diff -u "$(ls --sort=t | head -2 | tail -1)/support/nginx/peertube" "$(ls --sort=t | head -1)/support/nginx/peertube" +diff -u "$(ls -t | head -2 | tail -1)/support/nginx/peertube" "$(ls -t | head -1)/support/nginx/peertube" ``` ### Update systemd service @@ -379,7 +379,7 @@ Check changes in systemd configuration: ```bash cd /var/www/peertube/versions -diff -u "$(ls --sort=t | head -2 | tail -1)/support/systemd/peertube.service" "$(ls --sort=t | head -1)/support/systemd/peertube.service" +diff -u "$(ls -t | head -2 | tail -1)/support/systemd/peertube.service" "$(ls -t | head -1)/support/systemd/peertube.service" ``` ### Restart PeerTube