diff -Nru wasta-logos-setup-1.1.1~ubuntu18.04.1/debian/changelog wasta-logos-setup-1.1.2~ubuntu18.04.1/debian/changelog --- wasta-logos-setup-1.1.1~ubuntu18.04.1/debian/changelog 2020-05-12 17:24:38.000000000 +0000 +++ wasta-logos-setup-1.1.2~ubuntu18.04.1/debian/changelog 2020-05-18 18:03:26.000000000 +0000 @@ -1,10 +1,16 @@ -wasta-logos-setup (1.1.1~ubuntu18.04.1) bionic; urgency=low +wasta-logos-setup (1.1.2~ubuntu18.04.1) bionic; urgency=low * Auto build. - -- Wasta-Linux Tue, 12 May 2020 17:24:38 +0000 + -- Rik Shaw Mon, 18 May 2020 18:03:26 +0000 -wasta-logos-setup (1.1.1) UNRELEASED; urgency=medium +wasta-logos-setup (1.1.2) bionic; urgency=medium + + * using xdg-user-dirs to set Downloads directory + + -- Rik Shaw Mon, 18 May 2020 12:55:03 -0500 + +wasta-logos-setup (1.1.1) bionic; urgency=medium * updating to use dotnet48 * adding sleep so that launcher found for sed edits diff -Nru wasta-logos-setup-1.1.1~ubuntu18.04.1/debian/control wasta-logos-setup-1.1.2~ubuntu18.04.1/debian/control --- wasta-logos-setup-1.1.1~ubuntu18.04.1/debian/control 2020-05-12 17:24:38.000000000 +0000 +++ wasta-logos-setup-1.1.2~ubuntu18.04.1/debian/control 2020-05-18 18:03:26.000000000 +0000 @@ -8,12 +8,12 @@ Package: wasta-logos-setup Architecture: all -Depends: cabextract, rsync, wasta-wine, wasta-winetricks, zenity, ${misc:Depends} +Depends: cabextract, rsync, wasta-wine, wasta-winetricks, xdg-user-dirs, zenity, ${misc:Depends} Recommends: wasta-logos-installer Description: Setup Logos via WINE - Patches WINE for Logos compatibility, sets up Logos WINE prefix using - wasta-wine, installs .NET 4.7.2 in the wine prefix using wasta-winetricks, - and installs Logos, using ~/Downloads/Logos-x86.msi or Logos-x86.msi from + Sets up Logos WINE prefix using wasta-wine, installs .NET 4.8 + in the wine prefix using wasta-winetricks, and installs Logos, + using ~/Downloads/Logos-x86.msi or Logos-x86.msi from wasta-logos-installer. . Needs to be run for each user wanting Logos. diff -Nru wasta-logos-setup-1.1.1~ubuntu18.04.1/debian/git-build-recipe.manifest wasta-logos-setup-1.1.2~ubuntu18.04.1/debian/git-build-recipe.manifest --- wasta-logos-setup-1.1.1~ubuntu18.04.1/debian/git-build-recipe.manifest 2020-05-12 17:24:38.000000000 +0000 +++ wasta-logos-setup-1.1.2~ubuntu18.04.1/debian/git-build-recipe.manifest 2020-05-18 18:03:26.000000000 +0000 @@ -1,2 +1,2 @@ # git-build-recipe format 0.4 deb-version {debversion} -lp:wasta-logos-setup git-commit:b6f2c56424fa346f7d4ee4318139f28485f1b592 +lp:wasta-logos-setup git-commit:d2d333ed1212b52d65f230cb0cf7aef9ae4b4a1b diff -Nru wasta-logos-setup-1.1.1~ubuntu18.04.1/install-files/bin/wasta-logos-setup wasta-logos-setup-1.1.2~ubuntu18.04.1/install-files/bin/wasta-logos-setup --- wasta-logos-setup-1.1.1~ubuntu18.04.1/install-files/bin/wasta-logos-setup 2020-05-12 17:24:38.000000000 +0000 +++ wasta-logos-setup-1.1.2~ubuntu18.04.1/install-files/bin/wasta-logos-setup 2020-05-18 18:03:26.000000000 +0000 @@ -17,6 +17,7 @@ # layouts) # 2020-03-12 rik: updating logo # 2020-05-11 rik: adding sleep before launcher edits +# 2020-05-18 rik: setting Downloads folder from xdg-user-dir # # ============================================================================== @@ -190,12 +191,13 @@ WINE_DIR=/opt/wasta-wine WINETRICKS_DIR=/opt/wasta-winetricks INSTALLER_DIR=/opt/wasta-logos-installer +DOWNLOAD_DIR="$(xdg-user-dir DOWNLOAD)" DIR=/usr/share/wasta-logos-setup PREFIX=/home/$USER/.wine-logos +ZENITY_SETTINGS="--no-wrap --height=200 --width=500 --window-icon=$DIR/resources/wasta-linux.svg" -zenity --question --no-wrap --height=200 --width=500 \ +zenity --question $ZENITY_SETTINGS \ --title="wasta-logos-setup" \ - --window-icon=$DIR/resources/wasta-linux.svg \ --text="Do you want to install Logos using Wine?\n Processing Summary: * Create a 'Logos Wine Prefix' using a patched wine from 'wasta-wine' @@ -214,9 +216,8 @@ if [ -d "$PREFIX" ]; then # Wine PREFIX exists, ask user if they want to overwrite it or update it - zenity --question --no-wrap --height=200 --width=500 \ + zenity --question $ZENITY_SETTINGS \ --title="wasta-logos-setup" \ - --window-icon=$DIR/resources/wasta-linux.svg \ --text="Remove existing Logos Wine Prefix?\n The folder '$PREFIX' already exists. Do you want to delete it in order to re-setup a new Logos Wine Prefix?\n" @@ -229,9 +230,8 @@ setupPrefix else # No Wine PREFIX: prompt user - zenity --question --no-wrap --height=200 --width=500 \ + zenity --question $ZENITY_SETTINGS \ --title="wasta-logos-setup" \ - --window-icon=$DIR/resources/wasta-linux.svg \ --text="Setup Logos Wine Prefix?\n Do you want to setup a new Logos Wine Prefix?\n" @@ -248,9 +248,9 @@ if [ -d "$PREFIX" ]; then INSTALL_FILE="" - if [ -e "$HOME/Downloads/Logos-x86.msi" ]; + if [ -e "$DOWNLOAD_DIR/Logos-x86.msi" ]; then - INSTALL_FILE="$HOME/Downloads/Logos-x86.msi" + INSTALL_FILE="$DOWNLOAD_DIR/Logos-x86.msi" elif [ -e "$INSTALLER_DIR/Logos-x86.msi" ]; then INSTALL_FILE="$INSTALLER_DIR/Logos-x86.msi" @@ -298,9 +298,8 @@ # Set Wine to winxp for Logos Usage WINEPREFIX=$PREFIX WINE="$WINE_DIR/bin/wine" WINESERVER="$WINE_DIR/bin/wineserver" "$WINETRICKS_DIR/winetricks" -q winxp - zenity --info --no-wrap --height=200 \ + zenity --info $ZENITY_SETTINGS \ --title="wasta-logos-setup: Complete" \ - --window-icon=$DIR/resources/wasta-linux.svg \ --text="Logos setup complete!\n Find 'Logos Bible Software' in the Main Menu under the 'Wine' category"