From 25a086b752bb1dd41dbdf7abdb4778cbdf27fe60 Mon Sep 17 00:00:00 2001 From: Levi Armstrong Date: Sun, 14 Jul 2019 21:29:51 -0500 Subject: [PATCH] Update installer --- installer/create_latest_installer.sh | 6 +++--- installer/installer_functions.sh | 5 ++++- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/installer/create_latest_installer.sh b/installer/create_latest_installer.sh index c49aa31b..d2ec4d88 100644 --- a/installer/create_latest_installer.sh +++ b/installer/create_latest_installer.sh @@ -9,13 +9,13 @@ DIR_PATH=`dirname $FILE_PATH` source "$DIR_PATH/installer_functions.sh" # Create Installer data for latest versions -INSTALLER_VERSION=1.0.11 # This must be incremented for every new release +INSTALLER_VERSION=1.0.12 # This must be incremented for every new release INSTALLER_RELEASE_DATE=2019-06-29 QTC_LATEST=1 QTC_REPO="https://code.qt.io/qt-creator/qt-creator.git" -QTC_VERSION=4.9.1.0 -QTC_BRANCH=v4.9.1 +QTC_VERSION=4.9.2.0 +QTC_BRANCH=v4.9.2 QTC_RELEASE_DATE=2019-05-28 RQTC_VERSION=0.3.8.0 RQTC_RELEASE_DATE=2019-06-28 diff --git a/installer/installer_functions.sh b/installer/installer_functions.sh index 1ca649bd..0cd6de2b 100644 --- a/installer/installer_functions.sh +++ b/installer/installer_functions.sh @@ -223,7 +223,7 @@ Component.prototype.createOperations = function() component.addOperation( "InstallIcons", "@TargetDir@/$INSTALL_DIR/share/icons" ); component.addOperation( "CreateDesktopEntry", "QtProject-qtcreator-ros-$PACKAGE_NAME.desktop", - "Type=Application\nExec=@TargetDir@/$INSTALL_DIR/bin/$COMMANDLINE_NAME\nPath=@TargetDir@/$INSTALL_DIR\nName=Qt Creator ($QTC_MINOR_VERSION)\nGenericName=The IDE of choice for Qt development.\nGenericName[de]=Die IDE der Wahl zur Qt Entwicklung\nIcon=QtProject-qtcreator\nTerminal=false\nCategories=Development;IDE;Qt;\nMimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;" + "Type=Application\nExec=@TargetDir@/$INSTALL_DIR/bin/$COMMANDLINE_NAME\nPath=@TargetDir@/$INSTALL_DIR\nName=Qt Creator ($QTC_MINOR_VERSION)\nGenericName=The IDE of choice for Qt development.\nGenericName[de]=Die IDE der Wahl zur Qt Entwicklung\nIcon=QtProject-qtcreator\nTerminal=false\nStartupWMClass=qtcreator-ros\nCategories=Development;IDE;Qt;\nMimeType=text/x-c++src;text/x-c++hdr;text/x-xsrc;application/x-designer;application/vnd.qt.qmakeprofile;application/vnd.qt.xml.resource;text/x-qml;text/x-qt.qml;text/x-qt.qbs;" ); component.addOperation("CreateLink", "@HomeDir@/Desktop/QtProject-qtcreator-ros-$PACKAGE_NAME.desktop", "@HomeDir@/.local/share/applications/QtProject-qtcreator-ros-$PACKAGE_NAME.desktop"); @@ -245,6 +245,9 @@ EOF } function installDepends { + + apt update + apt upgrade -y if [ "$DISTRO" = "trusty" ]; then # Install patchelf