From 2561132f23f24c407f6e3a0910e4201af659db94 Mon Sep 17 00:00:00 2001 From: iv <isabelle.vallet@nexedi.com> Date: Mon, 25 Jul 2016 10:39:08 +0000 Subject: [PATCH] NayuOS: fix test after bashrc changes. --- software/nayuos/scripts/test_nayuos_image | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/software/nayuos/scripts/test_nayuos_image b/software/nayuos/scripts/test_nayuos_image index fb7c52a20..80755036f 100644 --- a/software/nayuos/scripts/test_nayuos_image +++ b/software/nayuos/scripts/test_nayuos_image @@ -15,7 +15,7 @@ GRANDENET_SCRIPT="usr/local/bin/grandenet" INIT_SSH_SERVER="etc/init/openssh-server.conf" BASHRC="etc/skel/.bashrc" GIT_CORE="usr/local/libexec/git-core/" -EXPECTED_ALIAS="alias git='git --exec-path=/usr/local/libexec/git-core/'" +GIT_EXPECTED_EXPORT="export GIT_EXEC_PATH=/usr/local/libexec/git-core" VIRTUALENV_BIN="usr/local/bin/virtualenv" CHROMIUM_POLICY="etc/chromium/policies/recommended/nayuos_policy.json" @@ -41,7 +41,7 @@ if [[ $(ls "${MOUNTPOINT}/usr/local") ]] ; then my_diff=$(diff "${ORIGINAL_GRANDENET_SCRIPT}" "${MOUNTPOINT}/${GRANDENET_SCRIPT}") opensshd_config=$(ls "${MOUNTPOINT}/${INIT_SSH_SERVER}") gitcore=$(ls "${MOUNTPOINT}/${GIT_CORE}") - gitalias=$(grep "${EXPECTED_ALIAS}" "${MOUNTPOINT}/${BASHRC}") + gitexport=$(grep "${GIT_EXPECTED_EXPORT}" "${MOUNTPOINT}/${BASHRC}") virtualenvbin=$(ls "${MOUNTPOINT}/${VIRTUALENV_BIN}") chromium_policy=$(ls "${MOUNTPOINT}/${CHROMIUM_POLICY}") @@ -86,8 +86,8 @@ else echo "* test bashrc changes for git paths quick fix" - if [[ "${gitalias}" == "" ]] ; then - print_result ${FAILURE} "Expected alias for git command not in ${MOUNTPOINT}/${BASHRC}. There should be: ${EXPECTED_ALIAS}" + if [[ "${gitexport}" == "" ]] ; then + print_result ${FAILURE} "Expected alias for git command not in ${MOUNTPOINT}/${BASHRC}. There should be: ${GIT_EXPECTED_EXPORT}" else print_result ${SUCCESS} "git alias is correct." fi -- 2.30.9