diff --git a/lib/checks/check.sh b/lib/checks/check.sh index 634044c..57dea5f 100755 --- a/lib/checks/check.sh +++ b/lib/checks/check.sh @@ -69,7 +69,6 @@ $SUDO pacman $PACMAN_OPTIONS -S $(pacman -Sg base-devel | cut -d ' ' -f 2 | grep info "Checking basic executables work..." $SUDO pacman -Qi pacman 1> /dev/null -/usr/bin/proot --help 1> /dev/null /usr/bin/groot --help 1> /dev/null repo_package1=tree diff --git a/lib/core/common.sh b/lib/core/common.sh index eb728e9..624a33c 100644 --- a/lib/core/common.sh +++ b/lib/core/common.sh @@ -67,7 +67,7 @@ ORIGIN_WD=$(pwd) SH=("/bin/sh" "--login") # List of executables that are run in the host OS: -PROOT="${JUNEST_HOME}/usr/bin/proot" +PROOT="${JUNEST_HOME}/usr/bin/proot-${ARCH}" GROOT="${JUNEST_HOME}/usr/bin/groot" CLASSIC_CHROOT=chroot WGET="wget --no-check-certificate" diff --git a/pkgs/proot-static/PKGBUILD b/pkgs/proot-static/PKGBUILD index 95d34de..f73c126 100644 --- a/pkgs/proot-static/PKGBUILD +++ b/pkgs/proot-static/PKGBUILD @@ -27,26 +27,13 @@ noextract=() MAIN_REPO=https://s3-eu-west-1.amazonaws.com/junest-repo PROOT_LINK=${MAIN_REPO}/proot -source_x86_64=("${_pkgname}"::"$PROOT_LINK/proot-x86_64") -source_i686=("${_pkgname}"::"$PROOT_LINK/proot-x86") - -source_arm=("${_pkgname}"::"$PROOT_LINK/proot-arm") -source_armv6h=("${_pkgname}"::"$PROOT_LINK/proot-arm") -source_armv7h=("${_pkgname}"::"$PROOT_LINK/proot-arm") -source_aarch64=("${_pkgname}"::"$PROOT_LINK/proot-arm") - -md5sums_x86_64=('14080705dd45a6bafa20e909a68072cb') -md5sums_i686=('b1c08236b56d121e04e9e29b197d0eeb') - -md5sums_arm=('8218c5f00e77e2e6e04c372ced27c7e7') -md5sums_armv6h=('8218c5f00e77e2e6e04c372ced27c7e7') -md5sums_armv7h=('8218c5f00e77e2e6e04c372ced27c7e7') -md5sums_aarch64=('8218c5f00e77e2e6e04c372ced27c7e7') +source=("proot-x86_64"::"$PROOT_LINK/proot-x86_64" "proot-arm"::"$PROOT_LINK/proot-arm") +md5sums=('14080705dd45a6bafa20e909a68072cb' '8218c5f00e77e2e6e04c372ced27c7e7') package() { echo "Installing proot static binaries" install -d -m 755 "${pkgdir}/usr/bin/" - install -m 755 "${srcdir}/${_pkgname}" ${pkgdir}/usr/bin/proot + install -m 755 "${srcdir}/"${_pkgname}-* ${pkgdir}/usr/bin/ } # vim:set ts=2 sw=2 et: