diff --git a/docs/index.md b/docs/index.md index 143a240..4dfd13b 100644 --- a/docs/index.md +++ b/docs/index.md @@ -76,6 +76,8 @@ I guess the only remaining thing to do is try it! ## Dealing with errors +### there are unstashed changes in website directory + So it looks like the hook sends the log of the hook to the local stdout, which is cool! I had some files in it and so it looks like the pull didn't work, but it still built the documents. Might want to build in some error handling, but for now going to try again! ```shell @@ -94,3 +96,9 @@ remote: INFO - Cleaning site directory remote: INFO - Building documentation to directory: /var/www/services.anarchyplanet.org/public_html remote: INFO - Documentation built in 0.54 seconds ``` + +### if files in the website directory have changed + +When I stashed all the changes in the directory, this meant there was no update.sh. The script should pull before building; not sure why it didn't? + +I'll try changing it to use && diff --git a/update.sh b/update.sh index 9a665c2..800f092 100644 --- a/update.sh +++ b/update.sh @@ -2,6 +2,4 @@ # /var/www/services.anarchyplanet.org/update.sh cd /var/www/services.anarchyplanet.org -git pull origin master -mkdocs build -chgrp -R www-data public_html +git pull origin master && mkdocs build && chgrp -R www-data public_html