From e911888c9e1c0f3a4dd4628c50b339ed1c5c078d Mon Sep 17 00:00:00 2001 From: Lorenzo Martinico <lorenzo.martinico@nexedi.com> Date: Wed, 1 Aug 2018 08:33:57 +0000 Subject: [PATCH] Add option to install chromebrew --- software/nayuos/instance.cfg | 2 +- software/nayuos/scripts/cros_full_build.in | 15 +++++++++++++++ software/nayuos/software.cfg | 2 +- 3 files changed, 17 insertions(+), 2 deletions(-) diff --git a/software/nayuos/instance.cfg b/software/nayuos/instance.cfg index fbb53a397..65e3571e3 100644 --- a/software/nayuos/instance.cfg +++ b/software/nayuos/instance.cfg @@ -99,7 +99,7 @@ context = recipe = slapos.recipe.template:jinja2 template = {{ software_dir }}/scripts/cros_full_build.in rendered = ${directory:run}/cros_full_build -md5sum = e11a8ed3fc100ddf591469ca8ac75d52 +md5sum = dc252e64e03d82387dfca6c1d41bd5bb mode = 0700 context = key bash_path bin:bash diff --git a/software/nayuos/scripts/cros_full_build.in b/software/nayuos/scripts/cros_full_build.in index 1325a760b..81b7e3f70 100644 --- a/software/nayuos/scripts/cros_full_build.in +++ b/software/nayuos/scripts/cros_full_build.in @@ -274,6 +274,21 @@ safewrite() { __safewrite dd "\$@" ; } sudodd() { sudo dd "\$@" ; } sudosafewrite() { __safewrite sudodd "\$@" ; } +crew() { + if [[ ! -x /usr/local/bin/crew ]] ; then + read -p "Chromebrew is not on this machine; do you want to install it? [Y/n] " -r -n 1 crew_install + echo "" + if [[ ! \$crew_install =~ ^[Nn]\$ ]] ; then + echo "Fetching installation file..." + curl -Ls https://lab.nexedi.com/nexedi/chromebrew/raw/nexedi/install.sh | bash + else + return 1 + fi + else + command crew "\$@" + fi +} + # ----- END NayuOS configuration ----- EOF fi diff --git a/software/nayuos/software.cfg b/software/nayuos/software.cfg index d00fb2345..532402a4b 100644 --- a/software/nayuos/software.cfg +++ b/software/nayuos/software.cfg @@ -26,7 +26,7 @@ recipe = slapos.recipe.template:jinja2 template = ${:_profile_base_location_}/instance.cfg rendered = ${buildout:directory}/instance.cfg mode = 0644 -md5sum = 037a1c8c1091f07e8e5660b59223743f +md5sum = 4a01272e619f456ae7c9b7d96bff0cc3 context = key software_dir :_profile_base_location_ key instance_dir buildout:directory -- 2.30.9