diff --git a/VERSION b/VERSION index 9fe9ff9..a8907c0 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -7.0.1 +7.0.2 diff --git a/bin/junest b/bin/junest index 381864b..8ea3b19 100755 --- a/bin/junest +++ b/bin/junest @@ -40,23 +40,23 @@ usage() { echo echo -e " n[s] Access via Linux Namespaces using GRoot (Default action)" echo -e " -b, --backend-args Arguments for GRoot backend program" - echo -e " ($CMD groot -p \"--help\" to check out the GRoot options)" + echo -e " ($CMD groot -b \"--help\" to check out the GRoot options)" echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment" echo echo -e " p[root] Access via PRoot" echo -e " -f, --fakeroot Run $NAME with fakeroot privileges" echo -e " -b, --backend-args Arguments for PRoot backend program" - echo -e " ($CMD proot -p \"--help\" to check out the PRoot options)" + echo -e " ($CMD proot -b \"--help\" to check out the PRoot options)" echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment" echo echo -e " g[root] Access with root privileges via GRoot" echo -e " -b, --backend-args Arguments for GRoot backend program" - echo -e " ($CMD groot -p \"--help\" to check out the GRoot options)" + echo -e " ($CMD groot -b \"--help\" to check out the GRoot options)" echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment" echo echo -e " r[oot] Access with root privileges via classic chroot" echo -e " -b, --backend-args Arguments for chroot backend program" - echo -e " ($CMD root -p \"--help\" to check out the chroot options)" + echo -e " ($CMD root -b \"--help\" to check out the chroot options)" echo -e " -n, --no-copy-files Do not copy common etc files into $NAME environment" echo echo -e " b[uild] Build a $NAME image (must run in ArchLinux)" diff --git a/lib/checks/check.sh b/lib/checks/check.sh index ac34171..9ee7505 100755 --- a/lib/checks/check.sh +++ b/lib/checks/check.sh @@ -69,16 +69,14 @@ pacman --noconfirm -Rsn ${repo_package2} if ! $SKIP_AUR_TESTS then - aur_package=aurutils + aur_package=tcptraceroute info "Checking ${aur_package} package from AUR repo..." maindir=$(mktemp -d -t ${CMD}.XXXXXXXXXX) builtin cd ${maindir} curl -L -J -O -k "https://aur.archlinux.org/cgit/aur.git/plain/PKGBUILD?h=${aur_package}" - curl -L -J -O -k "https://aur.archlinux.org/cgit/aur.git/plain/${aur_package}.install?h=${aur_package}" - /opt/makepkg/bin/makepkg -sfcd + /opt/makepkg/bin/makepkg -sfc --noconfirm pacman --noconfirm -U ${aur_package}*.pkg.tar.xz - aur search aur 1> /dev/null pacman --noconfirm -Rsn ${aur_package} fi diff --git a/lib/core/common.sh b/lib/core/common.sh index 996c24f..601e46c 100644 --- a/lib/core/common.sh +++ b/lib/core/common.sh @@ -152,7 +152,7 @@ function proot_cmd(){ elif PROOT_NO_SECCOMP=1 ${PROOT} ${proot_args} "${SH[@]}" "-c" ":" then warn "Warn: Proot is not properly working. Disabling SECCOMP and expect the application to run slowly in particular when it uses syscalls intensively." - warn "Try to use Linux namespace instead as it is more reliable: junest -u" + warn "Try to use Linux namespace instead as it is more reliable: junest ns" PROOT_NO_SECCOMP=1 ${PROOT} ${proot_args} "${@}" else die "Error: Something went wrong with proot command. Exiting"