From 4d08bc5212a60e87c3de0e053aef79a64cf9694b Mon Sep 17 00:00:00 2001 From: Aleksandr Gornostal Date: Sun, 26 May 2019 22:29:00 +0300 Subject: [PATCH] Added --skip-if-built flag for build-preferences command --- scripts/build-deb.sh | 2 +- scripts/build-preferences.sh | 7 ++++++- scripts/build-targz.sh | 2 +- scripts/run-ci.sh | 2 +- ul | 2 +- 5 files changed, 10 insertions(+), 5 deletions(-) diff --git a/scripts/build-deb.sh b/scripts/build-deb.sh index 718ce4e34..4e3e3c96a 100755 --- a/scripts/build-deb.sh +++ b/scripts/build-deb.sh @@ -37,7 +37,7 @@ build-deb () { tmpsrc="$tmpdir/$name" info "Building Preferences UI" - ./ul build-preferences + ./ul build-preferences --skip-if-built info "Copying src to a temp dir" rm -rf $tmpdir/* || true diff --git a/scripts/build-preferences.sh b/scripts/build-preferences.sh index 725ac4b73..e0ccd32be 100755 --- a/scripts/build-preferences.sh +++ b/scripts/build-preferences.sh @@ -4,10 +4,15 @@ # Builds Ulauncher Preferences UI with nodejs ############################################# build-preferences () { - set -ex + set -e + if [[ "$1" == '--skip-if-built' ]] && [[ -d data/preferences/dist ]]; then + success "Preferences are already built. Skipping." + return + fi cd data/preferences + set -x yarn install yarn lint yarn unit diff --git a/scripts/build-targz.sh b/scripts/build-targz.sh index c9c353326..6307e0aca 100755 --- a/scripts/build-targz.sh +++ b/scripts/build-targz.sh @@ -13,7 +13,7 @@ build-targz () { set -ex - ./ul build-preferences + ./ul build-preferences --skip-if-built name="ulauncher" tmpdir="/tmp/$name" diff --git a/scripts/run-ci.sh b/scripts/run-ci.sh index c3649a3b7..629181665 100755 --- a/scripts/run-ci.sh +++ b/scripts/run-ci.sh @@ -6,7 +6,7 @@ run-ci () { step1="ln -s /var/node_modules data/preferences" # take node modules from cache step2="cd docs && sphinx-apidoc -d 5 -o source ../ulauncher && make html && cd .." step3="./ul test" - step4="./ul build-preferences" + step4="./ul build-preferences --skip-if-built" exec docker run \ --rm \ diff --git a/ul b/ul index e486fe553..c64e84017 100755 --- a/ul +++ b/ul @@ -41,7 +41,7 @@ main () { aur-update) ./scripts/aur-update.py $2 ;; create-build-images) create-build-images ;; build-doc) build-doc ;; - build-preferences) build-preferences ;; + build-preferences) build-preferences $2 ;; make-release) make-release $2 ;; travis-cli-container) travis-cli-container ;; run-ci) run-ci ;;