diff --git a/.gitignore b/.gitignore index 784199ef..d489a8c8 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,5 @@ /build/ +/distr/ /bin/app/Debug/ /bin/app/Release/ diff --git a/CMakeLists.txt b/CMakeLists.txt index e230798a..038ea69b 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -360,11 +360,7 @@ if(UNIX AND NOT APPLE) ${CMAKE_SOURCE_DIR}/setup/Linux/Coati.sh DESTINATION share/coati ) - INSTALL(CODE "execute_process(COMMAND \"${CMAKE_COMMAND}\" -E create_symlink - /usr/local/share/coati/Coati.sh - /usr/local/bin/coati - )") - INSTALL(PROGRAMS /usr/local/bin/coati + INSTALL(PROGRAMS ${CMAKE_SOURCE_DIR}/setup/Linux/coati DESTINATION bin/ ) # add the automatically determined parts of the RPATH diff --git a/script/build.sh b/script/build.sh index 4c8f0c66..7fa535d5 100755 --- a/script/build.sh +++ b/script/build.sh @@ -27,6 +27,11 @@ then #echo "debug app" ninja -C build/Debug Coati && cd bin/app && Debug/Coati fi +elif [ "$1" = "package" ] || [ "$1" = "p" ] +then + ninja package -C build/Release Coati + mkdir -p distr && cp build/Release/Coati*.deb distr && cp build/Release/Coati*.tar.gz distr + echo "Packages copied into the distr folder" else echo "no arguments: first argument 'release' or 'debug', second argument 'test' for tests" fi diff --git a/setup/Linux/Coati.sh b/setup/Linux/Coati.sh index aed72266..f6a9b2d6 100755 --- a/setup/Linux/Coati.sh +++ b/setup/Linux/Coati.sh @@ -1,7 +1,7 @@ #!/bin/sh -if [ ! -d "~/.config/coati" ]; then +if [ ! -d "${HOME}/.config/coati" ]; then # Control will enter here if $DIRECTORY doesn't exist. - cp -r /usr/local/share/coati/.config/coati ~/.config/coati + cp -r /usr/local/share/coati/.config/coati ${HOME}/.config/coati echo "First start of Coati from this user, copy default configfiles to ~/.config/coati" fi diff --git a/setup/Linux/coati b/setup/Linux/coati new file mode 120000 index 00000000..c1fa4fce --- /dev/null +++ b/setup/Linux/coati @@ -0,0 +1 @@ +/usr/local/share/coati/Coati.sh \ No newline at end of file diff --git a/src/app/qt/window/QtAboutLicense.cpp b/src/app/qt/window/QtAboutLicense.cpp index ff53fb5c..db13806a 100644 --- a/src/app/qt/window/QtAboutLicense.cpp +++ b/src/app/qt/window/QtAboutLicense.cpp @@ -32,8 +32,6 @@ void QtAboutLicense::setup() void QtAboutLicense::populateForm(QFormLayout* layout) { - int minimumWidthForSecondCol = 360; - for(ThirdPartyLicense license : licenses3rdParties) { QLabel* licenseName = new QLabel();