From c5ed0d0fffcfc9c6843cbf2d02c4f9c4648b3e91 Mon Sep 17 00:00:00 2001
From: GleammerRay <101527589+GleammerRay@users.noreply.github.com>
Date: Sat, 16 Jul 2022 13:06:06 +0100
Subject: [PATCH] AppImage building improved

---
 appimage_builder => appimage/appimage_builder |  45 ++++++++++--------
 appimage/logo.png                             | Bin 0 -> 4439 bytes
 logo.svg                                      |  10 ++--
 3 files changed, 30 insertions(+), 25 deletions(-)
 rename appimage_builder => appimage/appimage_builder (52%)
 create mode 100644 appimage/logo.png

diff --git a/appimage_builder b/appimage/appimage_builder
similarity index 52%
rename from appimage_builder
rename to appimage/appimage_builder
index 056335cc..074ebe39 100755
--- a/appimage_builder
+++ b/appimage/appimage_builder
@@ -2,6 +2,11 @@
 
 # downloaded from https://gist.github.com/naveenadi/8dbe75c04cae7739f5cce0a260eb3e08
 
+if [ ! -d ../build ]; then
+  echo 'ERROR: current directory is not contained within a flutter project';
+  exit 0;
+fi
+
 export ARCH=$(uname -m)
 
 echo "INFO:Generator:Searching AppDir" 
@@ -19,25 +24,25 @@ read -p "? Version [Eg: 1.0.0]: " appVersion
 # read -p "? Architecture: " x86_64
 
 function download_appimagetool() {
-  if [ ! -d ./build ]; then mkdir ./build; fi
-  if [ ! -d ./build/appimage ]; then mkdir ./build/appimage; fi
-  if [ ! -d ./build/appimage/appimage-build ]; then mkdir ./build/appimage/appimage-build; fi
-  if [ ! -x ./build/appimage/appimage-build/appimagetool-$ARCH.AppImage ]; then
-    curl -L -o ./build/appimage/appimage-build/appimagetool-$ARCH.AppImage https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$ARCH.AppImage
-    chmod a+x ./build/appimage/appimage-build/appimagetool-$ARCH.AppImage 
+  if [ ! -d ../build ]; then mkdir ../build; fi
+  if [ ! -d ../build/appimage ]; then mkdir ../build/appimage; fi
+  if [ ! -d ../build/appimage/appimage-build ]; then mkdir ../build/appimage/appimage-build; fi
+  if [ ! -x ../build/appimage/appimage-build/appimagetool-$ARCH.AppImage ]; then
+    curl -L -o ../build/appimage/appimage-build/appimagetool-$ARCH.AppImage https://github.com/AppImage/AppImageKit/releases/download/continuous/appimagetool-$ARCH.AppImage
+    chmod a+x ../build/appimage/appimage-build/appimagetool-$ARCH.AppImage 
   fi
 }
 
 function create_appdir() {
-  if [ -d "./build/appimage/$appName.AppDir" ]; then rm -rf ./build/appimage/$appName.AppDir; fi
-  mkdir ./build/appimage/$appName.AppDir
+  if [ -d "../build/appimage/$appName.AppDir" ]; then rm -rf ../build/appimage/$appName.AppDir; fi
+  mkdir ../build/appimage/$appName.AppDir
 }
 
 function after_bundle() {
-  cp build/linux/x64/release/bundle/assistant build/appimage/$appName.AppDir
-  cp -r build/linux/x64/release/bundle/lib/. build/appimage/$appName.AppDir/lib
-  cp -r build/linux/x64/release/bundle/data build/appimage/$appName.AppDir
-  cp -r build/linux/x64/release/bundle/passy build/appimage/$appName.AppDir
+  cp ../build/linux/x64/release/bundle/assistant ../build/appimage/$appName.AppDir
+  cp -r ../build/linux/x64/release/bundle/lib/ ../build/appimage/$appName.AppDir/lib
+  cp -r ../build/linux/x64/release/bundle/data ../build/appimage/$appName.AppDir
+  cp -r ../build/linux/x64/release/bundle/passy ../build/appimage/$appName.AppDir
   # cp $appIcon AppDir/usr/share/icons/
 
   # cp -r build/linux/*/release/bundle/ $appName.AppDir
@@ -45,16 +50,16 @@ function after_bundle() {
   # if [[ $(file -b "$appIcon.[ps]*g") =~  ]];
 
   if [ ! -b "$appIcon.[ps]*g" ]; then 
-    cp $appIcon.[ps]*g build/appimage/$appName.AppDir
+    cp $appIcon.[ps]*g ../build/appimage/$appName.AppDir
     # mkdir -p $appName.AppDir/usr/share/icons/
     # cp $appIcon.[ps]*g $appName.AppDir/usr/share/icons/
   fi
 }
 
 function create_apprun() {
-  touch build/appimage/$appName.AppDir/AppRun
-  echo -e '#!/bin/sh\n\ncd "$(dirname "$0")"\nexec ./'$appExec'' > ./build/appimage/$appName.AppDir/AppRun
-  chmod +x ./build/appimage/$appName.AppDir/AppRun
+  touch ../build/appimage/$appName.AppDir/AppRun
+  echo -e '#!/bin/sh\n\ncd "$(dirname "$0")"\nexec ./'$appExec'' > ../build/appimage/$appName.AppDir/AppRun
+  chmod +x ../build/appimage/$appName.AppDir/AppRun
 }
 
 function create_desktop() {
@@ -71,17 +76,17 @@ function create_desktop() {
   local ca="Categories=Utility;"
   local co="Comment=Cross-Platform Password Manager"
 
-  touch ./build/appimage/$appName.AppDir/$appId.desktop
-  echo -e "$de\n$xaa\n$xav\n$xan\n$v\n$ty\n$te\n$n\n$e\n$i\n$ca\n$co" > ./build/appimage/$appName.AppDir/$appId.desktop
+  touch ../build/appimage/$appName.AppDir/$appId.desktop
+  echo -e "$de\n$xaa\n$xav\n$xan\n$v\n$ty\n$te\n$n\n$e\n$i\n$ca\n$co" > ../build/appimage/$appName.AppDir/$appId.desktop
 }
 
 function build_appimage() {
   # the build command itself:
-  ./build/appimage/appimage-build/appimagetool-$ARCH.AppImage ./build/appimage/$appName.AppDir 
+  ../build/appimage/appimage-build/appimagetool-$ARCH.AppImage ../build/appimage/$appName.AppDir 
 
   # move result in build folder
 
-  mv ./$appName-$ARCH.AppImage ./build/appimage/$appName-$appVersion-$ARCH.AppImage
+  mv ./$appName-$ARCH.AppImage ../build/appimage/$appName-$appVersion-$ARCH.AppImage
     
 }
 
diff --git a/appimage/logo.png b/appimage/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..523ed225508bddae75d692d2605a5aefc37a47b9
GIT binary patch
literal 4439
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
CHxI)A

literal 0
HcmV?d00001

diff --git a/logo.svg b/logo.svg
index 0d9e4944..8f8799a5 100644
--- a/logo.svg
+++ b/logo.svg
@@ -8,10 +8,10 @@
    version="1.1"
    id="svg8"
    inkscape:version="1.1.2 (0a00cf5339, 2022-02-04)"
-   sodipodi:docname="icon.svg"
+   sodipodi:docname="logo.svg"
    inkscape:export-filename="D:\Data\Simon\Documents\Projects\Personal\Software\passy\assets\images\logo.png"
-   inkscape:export-xdpi="192"
-   inkscape:export-ydpi="192"
+   inkscape:export-xdpi="34.488178"
+   inkscape:export-ydpi="34.488178"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns="http://www.w3.org/2000/svg"
@@ -29,7 +29,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="0.25"
-     inkscape:cx="902"
+     inkscape:cx="108"
      inkscape:cy="798"
      inkscape:document-units="mm"
      inkscape:current-layer="layer1"
@@ -38,7 +38,7 @@
      inkscape:guide-bbox="true"
      inkscape:window-width="956"
      inkscape:window-height="636"
-     inkscape:window-x="768"
+     inkscape:window-x="769"
      inkscape:window-y="256"
      inkscape:window-maximized="0"
      inkscape:snap-object-midpoints="true"