aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTom Ryder <tom@sanctum.geek.nz>2022-03-12 00:16:39 +1300
committerTom Ryder <tom@sanctum.geek.nz>2022-03-12 00:16:39 +1300
commit4925e43b0baf5ebd34a5d52acc6ff47907b2d090 (patch)
tree6422186e663efa53145f3e61fd6bd91a460b602b
parentMerge branch 'release/v11.11.0' (diff)
parentUpdate dotfiles(7) manual page (diff)
downloaddotfiles-4925e43b0baf5ebd34a5d52acc6ff47907b2d090.tar.gz
dotfiles-4925e43b0baf5ebd34a5d52acc6ff47907b2d090.zip
Merge branch 'release/v11.12.0'v11.12.0
* release/v11.12.0: Update dotfiles(7) manual page Switch to Librewolf Switch from youtube-dl to yt-dlp
-rw-r--r--Makefile8
-rw-r--r--README.md3
-rw-r--r--VERSION4
-rw-r--r--X/xinitrc.d/browser.sh10
-rw-r--r--man/man1/bp.1df2
-rw-r--r--man/man1/br.1df2
-rw-r--r--man/man7/dotfiles.7df2
-rw-r--r--yt-dlp/config (renamed from youtube-dl/config)0
8 files changed, 16 insertions, 15 deletions
diff --git a/Makefile b/Makefile
index ca3fe473..df6f04d1 100644
--- a/Makefile
+++ b/Makefile
@@ -52,7 +52,7 @@
install-vint \
install-wget \
install-x \
- install-youtube-dl \
+ install-yt-dlp \
install-zsh \
check \
check-bash \
@@ -636,9 +636,9 @@ install-x: check-xinit
cp -p -- X/Xresources $(HOME)/.Xresources
cp -p -- X/Xresources.d/* $(HOME)/.Xresources.d
-install-youtube-dl:
- mkdir -p -- $(XDG_CONFIG_HOME)/youtube-dl
- cp -p -- youtube-dl/config $(XDG_CONFIG_HOME)/youtube-dl
+install-yt-dlp install-youtube-dl:
+ mkdir -p -- $(XDG_CONFIG_HOME)/yt-dlp
+ cp -p -- yt-dlp/config $(XDG_CONFIG_HOME)/yt-dlp
install-zsh: check-zsh install-sh
mkdir -p -- $(HOME)/.zshrc.d
diff --git a/README.md b/README.md
index 57eb47f4..15a46b71 100644
--- a/README.md
+++ b/README.md
@@ -113,7 +113,8 @@ Configuration is included for:
- [Vim](https://www.vim.org/)---Vi IMproved, a text editor
- [X11](https://www.x.org/wiki/)---Windowing system with network transparency
for Unix
-- [youtube-dl](https://youtube-dl.org/)---Download manager for video hosting websites
+- [yt-dlp](https://github.com/yt-dlp/yt-dlp)---Download manager for video
+ hosting websites
There is also some slightly customized support for multi-version environment
management for three major scripting languages:
diff --git a/VERSION b/VERSION
index 8e9bee82..777f39a2 100644
--- a/VERSION
+++ b/VERSION
@@ -1,2 +1,2 @@
-tejr dotfiles v11.11.0
-Fri, 21 Jan 2022 03:24:40 +0000
+tejr dotfiles v11.12.0
+Fri, 11 Mar 2022 11:16:34 +0000
diff --git a/X/xinitrc.d/browser.sh b/X/xinitrc.d/browser.sh
index 0153fba9..b6e1d57e 100644
--- a/X/xinitrc.d/browser.sh
+++ b/X/xinitrc.d/browser.sh
@@ -1,8 +1,8 @@
# Choose a GUI browser with some rough heuristics
-# If Firefox is available, start by assuming that
-if command -v firefox >/dev/null 2>&1 ; then
- BROWSER=firefox
+# If Librewolf is available, start by assuming that
+if command -v librewolf >/dev/null 2>&1 ; then
+ BROWSER=librewolf
fi
# Consider a switch to Dillo...
@@ -11,8 +11,8 @@ if (
exec >/dev/null 2>&1
# Don't switch if it's not there
command -v dillo || exit
- # Switch if Firefox isn't there
- command -v firefox || exit 0
+ # Switch if Librewolf isn't there
+ command -v librewolf || exit 0
# Switch if procfs says we have less than 2GB of RAM
awk '$1=="MemTotal:"&&$2<2^20{m++}END{exit!m}' < /proc/meminfo
) ; then
diff --git a/man/man1/bp.1df b/man/man1/bp.1df
index 93f08f74..835ffaf6 100644
--- a/man/man1/bp.1df
+++ b/man/man1/bp.1df
@@ -5,7 +5,7 @@
.SH SYNOPSIS
.B bp
.br
-BROWSER=firefox
+BROWSER=librewolf
.B bp
.SH DESCRIPTION
.B bp
diff --git a/man/man1/br.1df b/man/man1/br.1df
index a84a55d3..1690af5c 100644
--- a/man/man1/br.1df
+++ b/man/man1/br.1df
@@ -8,7 +8,7 @@
.B br
http://www.example.com/
.br
-BROWSER=firefox
+BROWSER=librewolf
.B br
.SH DESCRIPTION
.B br
diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df
index 765b9403..73055a24 100644
--- a/man/man7/dotfiles.7df
+++ b/man/man7/dotfiles.7df
@@ -174,7 +174,7 @@ Vim (https://www.vim.org/)\[em]Vi IMproved, a text editor
X11 (https://www.x.org/wiki/)\[em]Windowing system with network
transparency for Unix
.IP \[bu] 2
-youtube-dl (https://youtube-dl.org/)\[em]Download manager for video
+yt-dlp (https://github.com/yt-dlp/yt-dlp)\[em]Download manager for video
hosting websites
.PP
There is also some slightly customized support for multi-version
diff --git a/youtube-dl/config b/yt-dlp/config
index ae2162f5..ae2162f5 100644
--- a/youtube-dl/config
+++ b/yt-dlp/config