use ~/.local/bin as the system bin path of TeX Live if it exists, oth…

…erwise still use ~/bin (#365)

DESCRIPTION

@@ -1,7 +1,7 @@
 Package: tinytex
 Type: Package
 Title: Helper Functions to Install and Maintain TeX Live, and Compile LaTeX Documents
-Version: 0.38.2
+Version: 0.38.3
 Authors@R: c(
   person("Yihui", "Xie", role = c("aut", "cre", "cph"), email = "xie@yihui.name", comment = c(ORCID = "0000-0003-0645-5666")),
   person(family = "RStudio, PBC", role = "cph"),

R/install.R

@@ -66,7 +66,7 @@ install_tinytex = function(
     os,
     'unix' = {
       check_local_bin()
-      if (os_index != 3 && !dir_exists('~/bin')) on.exit(message(
+      if (os_index != 3 && !any(dir_exists(c('~/bin', '~/.local/bin')))) on.exit(message(
         'You may have to restart your system after installing TinyTeX to make sure ',
         '~/bin appears in your PATH variable (https://github.com/yihui/tinytex/issues/16).'
       ), add = TRUE)
@@ -411,8 +411,8 @@ install_prebuilt = function(
 # post-install configurations
 post_install_config = function(add_path, extra_packages, repo, hash = FALSE) {
   if (os_index == 2) {
-    dir.create('~/bin', FALSE, TRUE)
-    tlmgr(c('option', 'sys_bin', '~/bin'))
+    if (!dir_exists(bin_dir <- '~/.local/bin')) dir.create(bin_dir <- '~/bin', FALSE, TRUE)
+    tlmgr(c('option', 'sys_bin', bin_dir))
   }
   # fix fonts.conf: https://github.com/yihui/tinytex/issues/313
   tlmgr(c('postaction', 'install', 'script', 'xetex'), .quiet = TRUE)

tools/install-bin-unix.sh

@@ -59,7 +59,13 @@ else if [ $TINYTEX_INSTALLER != 'installer-unix' ]; then
 fi
 
 cd $TEXDIR/bin/*/
-[ $OSNAME != "Darwin" ] && ./tlmgr option sys_bin ~/bin
+
+BINDIR="$HOME/.local/bin"
+if [ ! -d  $BINDIR]; then
+  BINDIR="$HOME/bin"
+fi
+
+[ $OSNAME != "Darwin" ] && ./tlmgr option sys_bin $BINDIR
 ./tlmgr postaction install script xetex  # GH issue #313
 ([ -z $CI ] || [ $(echo $CI | tr "[:upper:]" "[:lower:]") != "true" ]) && ./tlmgr option repository ctan
 ./tlmgr path add