diff options
| author | bill-auger <mr.j.spam.me@gmail.com> | 2020-12-04 07:55:47 -0500 |
|---|---|---|
| committer | bill-auger <mr.j.spam.me@gmail.com> | 2020-12-04 07:55:47 -0500 |
| commit | 2384967af5f63915521ab345dae1515613dce51b (patch) | |
| tree | 231809c399dc205785626f9e2c3fddd8f4e1c91f | |
| parent | 5413c14d8c42c689991d669ee86305edd7a8cbc6 (diff) | |
wip - translations, housekeepingwip-2020-09-18
| -rw-r--r-- | makechrootpkg.in | 9 | ||||
| -rw-r--r-- | mkarchroot.in | 3 |
2 files changed, 5 insertions, 7 deletions
diff --git a/makechrootpkg.in b/makechrootpkg.in index 927c12f..d9dbf90 100644 --- a/makechrootpkg.in +++ b/makechrootpkg.in @@ -10,9 +10,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -m4_include(lib/archroot.sh) -m4_include(lib/common.sh) m4_include(lib/messages.sh) +m4_include(lib/archroot.sh) shopt -s nullglob @@ -46,8 +45,8 @@ usage() { fork a new instance of the calling process to handle it (usually libremakepkg), and exit immediately' echo - print "Default makepkg args: %s" "${default_makepkg_args[*]}" print "Default working copy name: %s" "${copy}" + print "Default makepkg args: %s" "${default_makepkg_args[*]}" echo flag 'Options:' \ '-h' 'This help' \ @@ -341,7 +340,7 @@ download_sources() { plain "| Restarting libremakepkg to complete the build |" echo "-------------------------------------------------" die - else die "Could not download sources." + else die $(_ "Could not download sources") fi fi @@ -399,7 +398,7 @@ main() { local basedir= local makepkg_user= local chrootdir= - local missing_chroot_dir_fmt="$(_ "No chroot dir defined, or invalid path '%s'")" + local missing_chroot_dir_fmt="$( _ "No chroot dir defined, or invalid path '%s'")" local missing_chroot_seed_fmt="$(_ "Missing 'root' chroot seed. Try using: mkarchroot %s/root base-devel")" declare -a install_pkgs declare -i ret=0 diff --git a/mkarchroot.in b/mkarchroot.in index 24dcbb6..17cdf75 100644 --- a/mkarchroot.in +++ b/mkarchroot.in @@ -10,9 +10,8 @@ # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. -m4_include(lib/common.sh) -m4_include(lib/archroot.sh) m4_include(lib/messages.sh) +m4_include(lib/archroot.sh) working_dir='' |