From 98969d9bf3efca05eb2781a91282b204a5a8d749 Mon Sep 17 00:00:00 2001 From: David P Date: Fri, 9 Jul 2021 03:03:54 -0400 Subject: librechroot: fix bind mounts; update .gitignore; update translations --- po/es/librelib.po | 4 ++++ src/chroot-tools/librechroot | 6 +++--- src/lib/.gitignore | 2 ++ 3 files changed, 9 insertions(+), 3 deletions(-) diff --git a/po/es/librelib.po b/po/es/librelib.po index 7d289c5..fabcb27 100644 --- a/po/es/librelib.po +++ b/po/es/librelib.po @@ -286,3 +286,7 @@ msgstr "no se ha dado ningún archivo" #: src/lib/messages.sh:60 msgid "panic: malformed call to internal function" msgstr "pánico: llamada malformada a la función interna" + +#: src/lib/mount.sh:11 +msgid "Error! Attempting to overwrite existing EXIT trap" +msgstr "¡Error! Intentando sobreescribir trampa EXIT existente" diff --git a/src/chroot-tools/librechroot b/src/chroot-tools/librechroot index 48e83c2..c0ba4b4 100755 --- a/src/chroot-tools/librechroot +++ b/src/chroot-tools/librechroot @@ -108,7 +108,7 @@ chroot-run() { "$_chroot_run" \ "${mkarchroot_flags[@]}" \ - "${chroot_run_flags[@]}" + "${chroot_run_flags[@]}" \ "$copydir" \ -- \ "${cmd[@]}" @@ -338,8 +338,8 @@ main() { -C "$tmppacmanconf" -M "/usr/share/pacman/defaults/makepkg.conf.$OPTARG" );; - w) chroot_run_flags+=(-b "-B:$OPTARG:$OPTARG");; - r) chroot_run_flags+=(-b "-Br:$OPTARG:$OPTARG");; + w) chroot_run_flags+=(-b "-B:$OPTARG");; + r) chroot_run_flags+=(-b "-Br:$OPTARG");; *) usage >&2; return $EXIT_INVALIDARGUMENT;; esac used_opts[$opt]+=1 diff --git a/src/lib/.gitignore b/src/lib/.gitignore index ec4ff7a..d12288a 100644 --- a/src/lib/.gitignore +++ b/src/lib/.gitignore @@ -2,4 +2,6 @@ common.sh common.sh.in archroot.sh archroot.sh.in +mount.sh +mount.sh.in conf.sh -- cgit v1.2.2