diff --git a/resources/scripts/.travis-before-install.sh b/resources/scripts/.travis-before-install.sh index 7322ed8f8..5a7a74a6c 100755 --- a/resources/scripts/.travis-before-install.sh +++ b/resources/scripts/.travis-before-install.sh @@ -9,9 +9,9 @@ if test "$TRAVIS_OS_NAME" = "osx"; then brew link --force qt5 brew install curl brew link --force curl - brew uninstall gnu-sed - brew install gnu-sed --with-default-names - brew link --force gnu-sed + #brew uninstall gnu-sed + #brew install gnu-sed --with-default-names + #brew link --force gnu-sed else # Linux. sudo add-apt-repository ppa:beineri/opt-qt591-trusty -y diff --git a/resources/scripts/.travis-install-osx.sh b/resources/scripts/.travis-install-osx.sh index 413f4e0c5..3299dad10 100755 --- a/resources/scripts/.travis-install-osx.sh +++ b/resources/scripts/.travis-install-osx.sh @@ -34,7 +34,15 @@ git clone -q --depth=1 https://martinrotter:${GH_TOKEN}@github.com/martinrotter/ url=$(curl --upload-file "./$dmgname" "https://transfer.sh/$dmgnamenospace" --silent) -echo "| $(date +'%m-%d-%Y %T') | [$git_revision](https://github.com/martinrotter/rssguard/commit/$git_revision) | [transfer.sh]($url) | $(echo "$USE_WEBENGINE") | "$'\r' >> ./build-wiki/Mac-OS-X-development-builds.md +wikiline="| Mac OS | $(date +'%m-%d-%Y %T') | [$git_revision](https\://github.com/martinrotter/rssguard/commit/$git_revision) | [transfer.sh]($url) | $(echo "$USE_WEBENGINE") | " +wikifile="./build-wiki/Development-builds.md" +wikifilenew="./build-wiki/Development-builds.md.new" + +echo "Line to add: $wikiline" +cat "$wikifile" | sed -e "s@| Mac OS | .\+$USE_WEBENGINE | @$wikiline@g" > "$wikifilenew" + +cat "$wikifilenew" +#mv "$wikifilenew" "$wikifile" cd ./build-wiki git add *.*