From 94dc7b28a1b313cd8e0922be4b0301857b933f0e Mon Sep 17 00:00:00 2001 From: Ad5001 Date: Thu, 20 Jan 2022 12:10:11 +0100 Subject: [PATCH] Fixing bugs. --- .gitignore | 3 ++- README.md | 5 ++--- package-linux.sh | 2 +- win/installer.nsi | 15 ++++++++------- 4 files changed, 13 insertions(+), 12 deletions(-) diff --git a/.gitignore b/.gitignore index 4711199..b6e886d 100644 --- a/.gitignore +++ b/.gitignore @@ -28,4 +28,5 @@ docs/html .kdev4 AccountFree.pro AccountFree.pro.user -AccountFree.egg-info/ +*.egg-info/ +*.tar.gz diff --git a/README.md b/README.md index bcf5d1d..6a6251f 100644 --- a/README.md +++ b/README.md @@ -1,10 +1,9 @@ # ![icon](https://git.ad5001.eu/Ad5001/LogarithmPlotter/raw/branch/master/logplotter.svg) LogarithmPlotter [![Build Status](https://ci.ad5001.eu/api/badges/Ad5001/LogarithmPlotter/status.svg)](https://ci.ad5001.eu/Ad5001/LogarithmPlotter) -[![On flathub](https://img.shields.io/flathub/v/eu.ad5001.LogarithmPlotter?label=on%20flathub)](https://flathub.org/apps/details/eu.ad5001.LogarithmPlotter) -[![On Snapcraft](https://badgen.net/snapcraft/v/logarithmplotter?label=on%20snapcraft)](https://snapcraft.io/logarithmplotter) +[![On flathub](https://img.shields.io/flathub/v/eu.ad5001.LogarithmPlotter?label=on%20flathub&logo=Flathub&logoColor=white&color=4A86CF)](https://flathub.org/apps/details/eu.ad5001.LogarithmPlotter) +[![On Snapcraft](https://badgen.net/snapcraft/v/logarithmplotter?label=on%20snapcraft&color=82BEA0&icon=https://ad5001.eu/icons/skills/snapcraft.svg)](https://snapcraft.io/logarithmplotter) Create graphs with logarithm scales, namely BODE diagrams. - ## Run You can simply run LogarithmPlotter using `python3 run.py`. diff --git a/package-linux.sh b/package-linux.sh index 361161a..9e46527 100755 --- a/package-linux.sh +++ b/package-linux.sh @@ -1,7 +1,7 @@ #!/bin/bash python3 setup.py --remove-git-version --command-packages=stdeb.command sdist_dsc \ - --package logarithmplotter --copyright-file linux/debian/copyright --suite sid --depends3 "$(cat linux/debian/depends)" --section science \ + --package logarithmplotter --copyright-file linux/debian/copyright --suite impish --depends3 "$(cat linux/debian/depends)" --section science \ --debian-version "ppa1" bdist_deb # Flatpak building diff --git a/win/installer.nsi b/win/installer.nsi index 662a659..ebf4955 100644 --- a/win/installer.nsi +++ b/win/installer.nsi @@ -11,8 +11,9 @@ Unicode True !define PROG_ID "LogarithmPlotter.File.1" !define DEV_NAME "Ad5001" !define WEBSITE "https://apps.ad5001.eu/logarithmplotter" -!define APP_VERSION "0.1.0.0" -!define COPYRIGHT "Ad5001 (c) 2021" +!define VERSION_SHORT "0.1.3" +!define APP_VERSION "${VERSION_SHORT}.0" +!define COPYRIGHT "Ad5001 (c) 2022" !define DESCRIPTION "Create graphs with logarithm scales." !define REG_UNINSTALL "Software\Microsoft\Windows\CurrentVersion\Uninstall\LogarithmPlotter" @@ -25,7 +26,7 @@ Unicode True Name "${APP_NAME}" Caption "${APP_NAME}" BrandingText "${APP_NAME}" -OutFile "logarithmplotter-setup.exe" +OutFile "logarithmplotter-v${VERSION_SHORT}-setup.exe" RequestExecutionLevel admin ;Default installation folder @@ -45,10 +46,10 @@ VIAddVersionKey "FileVersion" "${APP_VERSION}" ;-------------------------------- ;defines MUST come before pages to apply to them -!define MUI_PAGE_HEADER_TEXT "${APP_NAME} v${APP_VERSION}" +!define MUI_PAGE_HEADER_TEXT "${APP_NAME} v${VERSION_SHORT}" !define MUI_PAGE_HEADER_SUBTEXT "${COPYRIGHT}" -!define MUI_WELCOMEPAGE_TITLE "Install ${APP_NAME} v${APP_VERSION}" +!define MUI_WELCOMEPAGE_TITLE "Install ${APP_NAME} v${VERSION_SHORT}" !define MUI_WELCOMEPAGE_TEXT "Welcome to the ${APP_NAME} installer! Follow the steps provided by this installer to install ${APP_NAME}" !define MUI_HEADERIMAGE_RIGHT ;Extra space for the title area @@ -88,9 +89,9 @@ Icon "logarithmplotter.ico" ;!define MUI_DIRECTORYPAGE_VARIABLE $INSTDIR !define MUI_INSTFILESPAGE_FINISHHEADER_TEXT "Success!" -!define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT "${APP_NAME} v${APP_VERSION} was installed on your computer" +!define MUI_INSTFILESPAGE_FINISHHEADER_SUBTEXT "${APP_NAME} v${VERSION_SHORT} was installed on your computer" !define MUI_INSTFILESPAGE_ABORTHEADER_TEXT "There was an error during the installation process." -!define MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT "${APP_NAME} v${APP_VERSION} was not installed on your computer." +!define MUI_INSTFILESPAGE_ABORTHEADER_SUBTEXT "${APP_NAME} v${VERSION_SHORT} was not installed on your computer." !define MUI_FINISHPAGE_TITLE "Finished!" ;!define MUI_FINISHPAGE_TITLE_3LINES