From 979f7f6546193c3b596258c44d8bc61528178684 Mon Sep 17 00:00:00 2001 From: Alfredo Ramos Date: Fri, 29 Jun 2018 09:15:32 -0500 Subject: [PATCH] Minor fixes in Travis CI tests (#262) chmod command should be executed before any other script in the travis directory --- .travis.yml | 4 +--- travis/linux_script.sh | 4 ++-- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/.travis.yml b/.travis.yml index 7e0d28b2..59131295 100644 --- a/.travis.yml +++ b/.travis.yml @@ -57,10 +57,8 @@ matrix: # osx_image: xcode9.2 before_install: - - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then travis/linux_before_install.sh; fi - -before_script: - chmod +x travis/*.sh + - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then travis/linux_before_install.sh; fi install: - if [[ "${TRAVIS_OS_NAME}" == "linux" ]]; then travis/linux_install.sh; fi diff --git a/travis/linux_script.sh b/travis/linux_script.sh index f884f3b2..c4f020e3 100755 --- a/travis/linux_script.sh +++ b/travis/linux_script.sh @@ -83,10 +83,10 @@ if [[ "${DIST}" == "trusty" ]]; then cp \ /usr/lib/x86_64-linux-gnu/qt5/plugins/platforminputcontexts/libfcitxplatforminputcontextplugin.so \ "${APPIMAGE_DST_PATH}"/appdir/usr/plugins/platforminputcontexts/ - cd "${APPIMAGE_DST_PATH}"/appdir/usr/bin + cd "${APPIMAGE_DST_PATH}"/appdir/usr/bin ln -sf ../plugins/platforms/ . # An unknown bug ln -sf ../share/flameshot/translations/ . # add translation soft link - cd "${project_dir}" + cd "${project_dir}" # -verbose=2 ./linuxdeployqt "${APPIMAGE_DST_PATH}"/appdir/usr/share/applications/flameshot.desktop -appimage