oak-team/oak-editor
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

changed line endings in shell scripts

Browse Source
This commit is contained in:
itsmattkc
2019-02-10 13:00:56 -08:00
parent 7f78f544f0
commit 7db1fe7165
3 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.travis/after_success.sh
+14 -14
View File
@@ -1,15 +1,15 @@
#!/bin/bash
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
upload.sh Olive*.zip
elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
# curl --upload-file Olive*.AppImage https://transfer.sh/Olive-git.$(git rev-parse --short HEAD)-$ARCH.AppImage
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
# only create release for master
if [ "$TRAVIS_BRANCH" != "master" ]; then
export TRAVIS_EVENT_TYPE=pull_request
fi
upload.sh Olive*.AppImage*
#!/bin/bash
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
upload.sh Olive*.zip
elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
find appdir -executable -type f -exec ldd {} \; | grep " => /usr" | cut -d " " -f 2-3 | sort | uniq
# curl --upload-file Olive*.AppImage https://transfer.sh/Olive-git.$(git rev-parse --short HEAD)-$ARCH.AppImage
wget -c https://github.com/probonopd/uploadtool/raw/master/upload.sh
# only create release for master
if [ "$TRAVIS_BRANCH" != "master" ]; then
export TRAVIS_EVENT_TYPE=pull_request
fi
upload.sh Olive*.AppImage*
fi
.travis/before_install.sh
+8 -8
View File
@@ -1,9 +1,9 @@
#!/bin/bash
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
brew install ffmpeg qt5
elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
sudo apt-get update -qq
#!/bin/bash
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
brew install ffmpeg qt5
elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
sudo add-apt-repository ppa:beineri/opt-qt593-trusty -y
sudo add-apt-repository ppa:jonathonf/ffmpeg-3 -y
sudo apt-get update -qq
fi
.travis/script.sh
+30 -30
View File
@@ -1,30 +1,30 @@
#!/bin/bash
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
lrelease olive.pro
qmake CONFIG+=release PREFIX=/usr
make -j$(nproc)
macdeployqt Olive.app
zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip Olive.app
elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
lrelease olive.pro
if [ "$ARCH" == "i386" ]; then
qmake CONFIG+=release "QMAKE_CFLAGS+=-m32" "QMAKE_CXXFLAGS+=-m32" "QMAKE_LFLAGS+=-m32" PREFIX=/usr -spec linux-g++-32; fi
else
qmake CONFIG+=release PREFIX=/usr
fi
make -j$(nproc)
make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
export VERSION=$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage
if [ "$ARCH" == "i386" ]; then
rm Olive*.AppImage
wget -c -nv "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-i686.AppImage"
chmod a+x appimagetool-i686.AppImage
./appimagetool-i686.AppImage 'appdir' -n -g
fi
fi
#!/bin/bash
if [[ $TRAVIS_OS_NAME == 'osx' ]]; then
lrelease olive.pro
qmake CONFIG+=release PREFIX=/usr
make -j$(nproc)
macdeployqt Olive.app
zip -r Olive-$(git rev-parse --short HEAD)-macOS.zip Olive.app
elif [[ $TRAVIS_OS_NAME == 'linux' ]]; then
lrelease olive.pro
if [ "$ARCH" == "i386" ]; then
qmake CONFIG+=release "QMAKE_CFLAGS+=-m32" "QMAKE_CXXFLAGS+=-m32" "QMAKE_LFLAGS+=-m32" PREFIX=/usr -spec linux-g++-32; fi
else
qmake CONFIG+=release PREFIX=/usr
fi
make -j$(nproc)
make INSTALL_ROOT=appdir -j$(nproc) install ; find appdir/
wget -c -nv "https://github.com/probonopd/linuxdeployqt/releases/download/continuous/linuxdeployqt-continuous-x86_64.AppImage"
chmod a+x linuxdeployqt-continuous-x86_64.AppImage
unset QTDIR; unset QT_PLUGIN_PATH ; unset LD_LIBRARY_PATH
export VERSION=$(git rev-parse --short HEAD) # linuxdeployqt uses this for naming the file
./linuxdeployqt-continuous-x86_64.AppImage appdir/usr/share/applications/*.desktop -appimage
if [ "$ARCH" == "i386" ]; then
rm Olive*.AppImage
wget -c -nv "https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-i686.AppImage"
chmod a+x appimagetool-i686.AppImage
./appimagetool-i686.AppImage 'appdir' -n -g
fi
fi