diff --git a/build b/build index 567c858..8d642ca 100755 --- a/build +++ b/build @@ -1,14 +1,10 @@ #!/usr/bin/env sh # Install pkgxx dependancies -echo "> Installing Moonscript…" -luarocks-5.1 install moonscript || exit 1 -echo "> Installing lua-argparse…" -luarocks-5.1 install argparse || exit 1 -echo "> Installing lua-process" -luarocks-5.1 install process --from=http://mah0x211.github.io/rocks/ +echo "> Installing Lua Split…" +luarocks-5.1 install split || exit 1 -# FIXME: need moonscript AND build.zsh +# FIXME: need build.zsh # FIXME: install pkgxx # FIXME: configure pkgxx diff --git a/install-and-chroot.sh b/install-and-chroot.sh index 3bb1028..7e4278d 100755 --- a/install-and-chroot.sh +++ b/install-and-chroot.sh @@ -1,19 +1,19 @@ #!/usr/bin/env sh -alpine_install='alpine-chroot-install' -alpine_directory='/alpine' +alpine_install=${INSTALL:-'alpine-chroot-install'} +alpine_directory=${DIR:-'/alpine'} # DL alpine install script if ! test -f "$alpine_install"; then - wget https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.6.0/alpine-chroot-install -O "$alpine_install" \ - && echo 'a827a4ba3d0817e7c88bae17fe34e50204983d1e alpine-chroot-install' | sha1sum -c \ + wget https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.9.0/alpine-chroot-install -O "$alpine_install" \ + && echo 'e5dfbbdc0c4b3363b99334510976c86bfa6cb251 alpine-chroot-install' | sha1sum -c \ || exit 1 chmod +x "$alpine_install" fi # Install Alpine if ! test -d "$alpine_directory"; then - sudo sh ./$alpine_install -p build-base -p git -p zsh -p lua-filesystem -p luarocks5.1 -p lua-toml || exit 1 + sudo sh ./$alpine_install -d $alpine_directory -p build-base -p git -p zsh -p lua-filesystem -p luarocks5.1 -p lua-toml -p moonscript -p abuild -p lua-argparse || exit 1 fi # Set rc_sys="prefix" to not disturb systemd on current system