From 6dd3f7cecc022323f745745a48dd74337842a1a4 Mon Sep 17 00:00:00 2001 From: Olivier DOSSMANN Date: Thu, 2 Aug 2018 17:26:55 +0200 Subject: [PATCH] Script readability (under 80 chars) --- install-and-chroot.sh | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/install-and-chroot.sh b/install-and-chroot.sh index e3d7994..12abe3b 100755 --- a/install-and-chroot.sh +++ b/install-and-chroot.sh @@ -2,6 +2,9 @@ SCRIPT=${SCRIPTNAME:-'alpine-chroot-install'} DIR=${DIRPATH:-'/alpine'} +script_url="https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install" +script_version="v0.9.0" +script_name="alpine-chroot-install" # Tests if ! [[ $DIR == /* ]]; then @@ -10,7 +13,7 @@ fi # DL alpine install script if ! test -f "$SCRIPT"; then - wget https://raw.githubusercontent.com/alpinelinux/alpine-chroot-install/v0.9.0/alpine-chroot-install -O "$SCRIPT" \ + wget "${script_url}/${script_version}/${script_name}" -O "$SCRIPT" \ && echo "e5dfbbdc0c4b3363b99334510976c86bfa6cb251 ${SCRIPT}" | sha1sum -c \ || exit 1 chmod +x "$SCRIPT" @@ -18,7 +21,16 @@ fi # Install Alpine if ! test -d "$DIR"; then - sudo sh ./$SCRIPT -d $DIR -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 + sudo sh ./$SCRIPT -d $DIR \ + -p abuild \ + -p build-base \ + -p git \ + -p lua-argparse \ + -p lua-filesystem \ + -p lua-toml \ + -p luarocks5.1 \ + -p moonscript \ + -p zsh || exit 1 fi # Set rc_sys="prefix" to not disturb systemd on current system