From 7b5b90f40dc22cb368935845e0275619992c0f06 Mon Sep 17 00:00:00 2001 From: Mitchell Krog Date: Thu, 1 Jun 2017 16:38:11 +0200 Subject: [PATCH] Fixes to Travis Build Testing Scripts --- travisCI/change-file.sh | 2 +- travisCI/install-nginx.sh | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/travisCI/change-file.sh b/travisCI/change-file.sh index 01919f941..beb605054 100755 --- a/travisCI/change-file.sh +++ b/travisCI/change-file.sh @@ -21,7 +21,7 @@ git config --global push.default simple git checkout master # Modify our file and make sure Travis is owner -sudo $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh +sudo $TRAVIS_BUILD_DIR/travisCI/modify-globalblacklist.sh sudo chown -R travis:travis $TRAVIS_BUILD_DIR/* # Add the modified file to the and commit it diff --git a/travisCI/install-nginx.sh b/travisCI/install-nginx.sh index 99cb718ab..7cb59778c 100755 --- a/travisCI/install-nginx.sh +++ b/travisCI/install-nginx.sh @@ -28,7 +28,7 @@ cd /usr/sbin sudo ./install-ngxblocker -x # Copy our default.vhost file into Nginx /sites-available/ -sudo cp $TRAVIS_BUILD_DIR/travis-ci/default.vhost /etc/nginx/sites-available/default.vhost +sudo cp $TRAVIS_BUILD_DIR/travisCI/default.vhost /etc/nginx/sites-available/default.vhost # Link the vhost file into Nginx /sites-enabled/ and reload nginx sudo ln -s /etc/nginx/sites-available/default.vhost /etc/nginx/sites-enabled/default.vhost @@ -47,7 +47,7 @@ sudo nginx -c /etc/nginx/nginx.conf #sudo service nginx reload # Copy our index.php file into the default site's root folder -sudo cp $TRAVIS_BUILD_DIR/travis-ci/index.php /var/www/html/index.php +sudo cp $TRAVIS_BUILD_DIR/travisCI/index.php /var/www/html/index.php # Run update-ngxblocker test cd /usr/sbin @@ -57,8 +57,8 @@ sudo ./update-ngxblocker #sudo service nginx reload # Set all our other setup and deploy scripts to be executable -sudo chmod +x $TRAVIS_BUILD_DIR/travis-ci/modify-globalblacklist.sh -sudo chmod +x $TRAVIS_BUILD_DIR/travis-ci/deploy-package.sh -sudo chmod +x $TRAVIS_BUILD_DIR/travis-ci/change-file.sh +sudo chmod +x $TRAVIS_BUILD_DIR/travisCI/modify-globalblacklist.sh +sudo chmod +x $TRAVIS_BUILD_DIR/travisCI/deploy-package.sh +sudo chmod +x $TRAVIS_BUILD_DIR/travisCI/change-file.sh # Travis now goes into the rest of the tests in the script: section of .travis.yml \ No newline at end of file