diff --git a/environment-setup/femtofox.chroot b/environment-setup/femtofox.chroot index 6dfd6d3..8341963 100644 --- a/environment-setup/femtofox.chroot +++ b/environment-setup/femtofox.chroot @@ -37,7 +37,7 @@ DEBIAN_FRONTEND=noninteractive apt install -y --option Dpkg::Options::="--force- echo "Installing dependencies for meshing-around and meshtastic cli..." - +#pip config set global.extra-index-url https://www.piwheels.org/simple pip3 install requests pyephem pytap2 meshtastic pypubsub geopy maidenhead beautifulsoup4 dadjokes schedule wikipedia googlesearch-python if [[ $? -eq 2 ]]; then echo "Error, step failed..."; fi diff --git a/environment-setup/foxbuntu-builder.sh b/environment-setup/foxbuntu-builder.sh index 5f9d0dd..e60f002 100644 --- a/environment-setup/foxbuntu-builder.sh +++ b/environment-setup/foxbuntu-builder.sh @@ -349,13 +349,23 @@ usage() { echo "To install the development environment use the arg 'sdk_install' and is intended to be run ONCE only." echo "To modify the chroot and build an updated image use the arg 'modify_chroot'." echo "To modify the kernel and build an updated image use the arg 'modify_kernel'." + echo "To specify a custom chroot script use the arg '--chroot-script /full/path/to/custom.chroot'" echo "other args: build_env sync_foxbuntu_changes build_kernelconfig install_rootfs build_rootfs build_uboot build_firmware create_image" echo "Example: sudo ~/foxbunto_env_setup.sh sdk_install" echo "Example: sudo ~/foxbunto_env_setup.sh modify_chroot" + echo "Example: sudo ~/foxbunto_env_setup.sh --chroot-script /home/user/custom.chroot" exit 0 } ################### MENU SYSTEM ################### +if [[ "${1}" == "--chroot-script" ]]; then + CHROOT_SCRIPT=${2} + echo "CHROOT_SCRIPT is set to '${CHROOT_SCRIPT}'" + echo "Press any key to continue..." + read -n 1 -s -r + shift 2 # Remove --chroot-script and its argument from the arguments list +fi + if [[ "${1}" =~ ^(-h|--help|h|help)$ ]]; then usage elif [[ -z ${1} ]]; then @@ -405,9 +415,6 @@ elif [[ -z ${1} ]]; then read -n 1 -s -r done else - if [[ "${1}" == "--chroot-script" ]]; then - CHROOT_SCRIPT=${2} - fi if declare -f "${1}" > /dev/null; then "${1}" else