From a6f51366956c18adc026f9933c5f90cdfd804e42 Mon Sep 17 00:00:00 2001 From: Nicolas North Date: Thu, 21 Jun 2018 18:47:37 +0200 Subject: [PATCH] Fix --- functions/check_install_version | 4 ++-- functions/run_install | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/functions/check_install_version b/functions/check_install_version index 35747d8..734fa8f 100644 --- a/functions/check_install_version +++ b/functions/check_install_version @@ -85,7 +85,7 @@ os-check_install_version() { ### Log current version being initiated to version_initiated - if [ ${custom_rc-null} = "e" ] + if [ ${custom_project_version-null} = "b" ] then latest_commit="$(cd $source_dir && git log -n 1 --pretty=format:"%H" | cut -c1-7)" echo "bleeding-edge-$latest_commit" > "$conf_dir/version/version_initiated" @@ -114,7 +114,7 @@ os-check_install_version() { ### Proceed to ensure that, if we're not installing a bleeding-edge version, there's no more recent version already installed ### If instead we're installing a bleeding-edge version, skip any checks as we're certainly intalling a newer version. - if [ ! ${custom_rc-null} = "e" ] + if [ ! ${custom_project_version-null} = "b" ] then if grep -q "bleeding-edge" "$conf_dir/version/version_installed" diff --git a/functions/run_install b/functions/run_install index 961111c..37a0b94 100644 --- a/functions/run_install +++ b/functions/run_install @@ -20,7 +20,7 @@ os-run_install() { ### Launch the installer - if [ ${custom_rc-null} = "e" ] + if [ ${custom_project_version-null} = "b" ] then echo "- * - !!! - * - !!! - * - !!! - * - !!! - * - !!! - * - !!! - * - !!! - * - !!! -" echo