www

commit 73a45ea0ec431f1a34a91f543f912708341f7cc8
parent 0b9355a7d12a91a9c892f5c6f17e67bb0b6d3c5c
Author: Georges Dupéron <georges.duperon@gmail.com>
Date:   Mon, 20 Mar 2017 20:07:08 +0100

Fix script

Diffstat:
M
.travis.yml
 | 
3
++-
M
travis-auto-deploy.sh
 | 
19
+++++++++++++++++--

2 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/.travis.yml b/.travis.yml
@@ -6,7 +6,8 @@ env:
   global:
   - secure: kPOwvkCDLpwJneCPeKUxbEZSsPWPpOpIK2wKf5Fm2BqJlUm+Wm8g5GZy1WHjo/IdNyb5mDIJzxWcr/uYDykehkNR1tRVrzUfRCVWqOFXGeI5P9e0zBaXp/GW3kfKivWNhpec8WSu9ZPjQhsRfDCjKRCHAB3JzwDWF8Kfl9UeBicFXQVRo+9zo3okRLsuJsEP/0MEtN0GxdsfKDleSW28AZLxu7raoJHHFY1t3QxMoYDd5312Pz7smv1/l4RG/P6XZZrtWEeVwctrNbU0CBO8tX8nqUCHA0bWyOW+crf4/NZZGg9e1RUq8eDbVUd7iGq81nr0+F7IvvwbvSLmpU2/b9hbcF4i4MpIE1Yy/0+zUhuTj1Yy8tw/irc8Y6Nc/g25BJBSCrfdPQnnbAESUv2ywbHC8vBztLca1xBQbQ+q0N0YYUK/mgxUiOznwTQ3PRIs/SENSdhFufT9pCRBp+lvkY+DVHSt6ogPYdRmyF/KPdcDWu5GqKrUs4KyroAzMLX/brw9+TjASnjTipnUWSlTQpoXjf1aQQuescqZMAbxEZH5ed6YvyPehdDqB8bpkeZ9OUkP8pV1kndSnnUsDH7Kn7ZyYUI20FNsU8Yqp1v94jOfrz2np2N9mJUT3teDy8k4yIxTERYSfbBcn4X30YX8fwRk/8skHRtgU4VOpUnIjkw=
 script:
-- sh travis-auto-deploy.sh
+- cp travis-auto-deploy.sh ~/travis-auto-deploy.sh
+- sh ~/travis-auto-deploy.sh
 branches:
   only:
   - v2.6-racket-mini-source
diff --git a/travis-auto-deploy.sh b/travis-auto-deploy.sh
@@ -12,22 +12,35 @@ elif test -z "${encrypted_675a73236f08_key:-}" -o -z "${encrypted_675a73236f08_i
 else
   set -x
   echo "Automatic push to gh-pages"
+  ls -l /home/travis/build/jsmaniac/scribble-mathjax/.git/index.lock || true
 
   # Git configuration:
   git config --global user.name "$(git log --format="%aN" HEAD -1) (Travis CI automatic commit)"
+  ls -l /home/travis/build/jsmaniac/scribble-mathjax/.git/index.lock || true
   git config --global user.email "$(git log --format="%aE" HEAD -1)"
+  ls -l /home/travis/build/jsmaniac/scribble-mathjax/.git/index.lock || true
 
   # SSH configuration
+  mkdir ~/.ssh
+  chmod 700 ~/.ssh
   set +x
-  if openssl aes-256-cbc -K $encrypted_675a73236f08_key -iv $encrypted_675a73236f08_iv -in travis-deploy-key-id_rsa.enc -out travis-deploy-key-id_rsa -d >/dev/null 2>&1; then
+  ls -l /home/travis/build/jsmaniac/scribble-mathjax/.git/index.lock || true
+  if openssl aes-256-cbc -K $encrypted_675a73236f08_key -iv $encrypted_675a73236f08_iv -in travis-deploy-key-id_rsa.enc -out ~/.ssh/travis-deploy-key-id_rsa -d >/dev/null 2>&1; then
     echo "Dectypred key successfully."
   else
     echo "Error while decrypting key."
   fi
+  ls -l /home/travis/build/jsmaniac/scribble-mathjax/.git/index.lock || true
   set -x
+  ls -l /home/travis/build/jsmaniac/scribble-mathjax/.git/index.lock || true
   chmod 600 travis-deploy-key-id_rsa
+  ls -l /home/travis/build/jsmaniac/scribble-mathjax/.git/index.lock || true
+  set +x
   eval `ssh-agent -s`
-  ssh-add travis-deploy-key-id_rsa
+  set -x
+  ls -l /home/travis/build/jsmaniac/scribble-mathjax/.git/index.lock || true
+  ssh-add ~/.ssh/travis-deploy-key-id_rsa
+  ls -l /home/travis/build/jsmaniac/scribble-mathjax/.git/index.lock || true
 
 
   npm install grunt grunt-cli grunt-contrib-clean grunt-regex-replace
@@ -35,6 +48,8 @@ else
   git add -A . &> /dev/null
   git rm -f .gitignore || true
   git rm -f Gruntfile.js || true
+  git rm -f travis-deploy-key-id_rsa.enc || true
+  git rm -f travis-auto-deploy.sh || true
   git commit -m "auto-commit" &>/dev/null
   git log --oneline --decorate --graph -10
   git push --force --quiet "git@github.com:jsmaniac/scribble-mathjax.git" HEAD:refs/heads/v2.6-racket-mini > /dev/null 2>&1