diff --git a/scripts/setup.sh b/scripts/setup.sh index 3f49400..54a2ad5 100755 --- a/scripts/setup.sh +++ b/scripts/setup.sh @@ -5,11 +5,11 @@ domainPath="./data/domain" hr() { [ -t 0 ] && printf '\033[0;32m%*s\033[0m\n' "$(tput cols)" '' | tr ' ' '='; } -log() { hr; echo -e "\033[0;34m${@}\033[0m"; hr; } +log() { hr; echo -e "\033[0;34m${1}\033[0m"; hr; } checkFile() { - if [ ! -f "${@}" ]; then - log "${@} does not exists, exiting" + if [ ! -f "${1}" ]; then + echo -e "\033[0;41m${1} does not exist!\033[0m" exit 1 fi } @@ -85,12 +85,12 @@ makeNextSubmodule "qmining-data-editor" "dataEditorPublic" # Moodle test userscript # ------------------------------------------------------------------------------------ log "Making moodle test userscript" -checkFile "$PWD/submodules/moodle-test-userscript/stable.user.js" -mkdir -pv "$PWD/publicDirs/qminingPublic/moodle-test-userscript" -ln -sfv "$PWD/submodules/moodle-test-userscript/stable.user.js" "$PWD/publicDirs/qminingPublic/moodle-test-userscript/" +checkFile "$PWD/submodules/moodle-test-userscript/user.js" cd "./submodules/moodle-test-userscript/" || exit 1 ./make.sh || exit 1 cd "${baseDir}" || exit 1 +mkdir -pv "$PWD/publicDirs/qminingPublic/moodle-test-userscript" +ln -sfv "$PWD/submodules/moodle-test-userscript/stable.user.js" "$PWD/publicDirs/qminingPublic/moodle-test-userscript/" # ------------------------------------------------------------------------------------ # DB-s