From d775456d259e82e662758264bf000a47865ecd4c Mon Sep 17 00:00:00 2001
From: julianmi <julianmi@users.noreply.github.com>
Date: Tue, 30 May 2017 15:24:02 +0200
Subject: [PATCH] Fixes ruby bug on Travis

---
 .travis.yml             |  3 +--
 doc/doc.qrc             | 44 ++++++++++++++++++++---------------------
 tools/mac_osx_deploy.sh |  6 ++++--
 3 files changed, 27 insertions(+), 26 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0886d32..d131a06 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -31,9 +31,8 @@ before_install:
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo add-apt-repository -y ppa:beineri/opt-qt${QT_LONG}-trusty; fi
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo apt-get update -qq; fi
   - if [ "${TRAVIS_OS_NAME}" = "linux" ]; then sudo apt-get install -y -qq qt${QT_BASE}base qt${QT_BASE}script qt${QT_BASE}tools; fi
+  - if [ "${TRAVIS_OS_NAME}" = "osx" ];   then rvm install ruby-2.3.1; rvm use 2.3.1; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ];   then brew update; fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ];   then brew install gpg; fi
-  - if [ "${TRAVIS_OS_NAME}" = "osx" ];   then rvm get stable --auto-dotfiles; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ];   then brew install ccache; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ];   then PATH=$PATH:/usr/local/opt/ccache/libexec; fi
   - if [ "${TRAVIS_OS_NAME}" = "osx" ];   then brew install qt; fi
diff --git a/doc/doc.qrc b/doc/doc.qrc
index 9772f06..9ac717f 100644
--- a/doc/doc.qrc
+++ b/doc/doc.qrc
@@ -1,22 +1,22 @@
-<RCC>
-    <qresource prefix="/">
-        <file>images/dialog_main.png</file>
-        <file>images/help.png</file>
-        <file>images/main_statusbar.png</file>
-        <file>images/append.png</file>
-        <file>images/conf.png</file>
-        <file>images/main.png</file>
-        <file>images/new_pw.png</file>
-        <file>images/pw.png</file>
-        <file>images/new_pro.png</file>
-        <file>images/ms.png</file>
-        <file>about.md</file>
-        <file>doc.html</file>
-        <file>doc.qrc</file>
-        <file>help.md</file>
-        <file>logfile.md</file>
-        <file>main.md</file>
-        <file>questionnaire.md</file>
-        <file>wizard.md</file>
-    </qresource>
-</RCC>
+<RCC>
+    <qresource prefix="/">
+        <file>images/dialog_main.png</file>
+        <file>images/help.png</file>
+        <file>images/main_statusbar.png</file>
+        <file>images/append.png</file>
+        <file>images/conf.png</file>
+        <file>images/main.png</file>
+        <file>images/new_pw.png</file>
+        <file>images/pw.png</file>
+        <file>images/new_pro.png</file>
+        <file>images/ms.png</file>
+        <file>about.md</file>
+        <file>doc.html</file>
+        <file>doc.qrc</file>
+        <file>help.md</file>
+        <file>logfile.md</file>
+        <file>main.md</file>
+        <file>questionnaire.md</file>
+        <file>wizard.md</file>
+    </qresource>
+</RCC>
diff --git a/tools/mac_osx_deploy.sh b/tools/mac_osx_deploy.sh
index 4adcc44..dd00ed8 100755
--- a/tools/mac_osx_deploy.sh
+++ b/tools/mac_osx_deploy.sh
@@ -8,8 +8,10 @@ else
     mv ${TRAVIS_BUILD_DIR}/build/release/EffortLog.dmg ${TRAVIS_BUILD_DIR}/build/release/EffortLog_$1_osx.dmg
     otool -L ${TRAVIS_BUILD_DIR}/build/release/EffortLog.app/Contents/MacOS/EffortLog
   elif [ $2 = "crypt" ]; then
-    install_name_tool -change /usr/local/opt/openssl/lib/libssl.1.0.0.dylib @executable_path/../Frameworks/libssl.1.0.0.dylib
-    install_name_tool -change /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib @executable_path/../Frameworks/libcrypto.1.0.0.dylib
+    install_name_tool -id @executable_path/../Frameworks/libssl.1.0.0.dylib EffortLog.app/Contents/Frameworks/libssl.1.0.0.dylib
+    install_name_tool -id @executable_path/../Frameworks/libcrypto.1.0.0.dylib EffortLog.app/Contents/Frameworks/libcrypto.1.0.0.dylib
+    install_name_tool -change /usr/local/opt/openssl/lib/libssl.1.0.0.dylib @executable_path/../Frameworks/libssl.1.0.0.dylib EffortLog.app/Contents/MacOS/EffortLog
+    install_name_tool -change /usr/local/opt/openssl/lib/libcrypto.1.0.0.dylib @executable_path/../Frameworks/libcrypto.1.0.0.dylib EffortLog.app/Contents/MacOS/EffortLog
     /usr/local/opt/qt5/bin/macdeployqt ${TRAVIS_BUILD_DIR}/build/release/EffortLog.app -always-overwrite -verbose=3 -appstore-compliant -dmg
     mv ${TRAVIS_BUILD_DIR}/build/release/EffortLog.dmg ${TRAVIS_BUILD_DIR}/build/release/EffortLog_$1_osx_encrypted.dmg
     otool -L ${TRAVIS_BUILD_DIR}/build/release/EffortLog.app/Contents/MacOS/EffortLog