From 8bfcc229516b062324ce98b0a04534664608f6bc Mon Sep 17 00:00:00 2001
From: Alex Butler <alexheretic@gmail.com>
Date: Sat, 27 Mar 2021 09:30:56 +0000
Subject: [PATCH] Update apart-core to 0.3.10, release 0.25

---
 apart-core     |  2 +-
 aur            |  2 +-
 build-dist     |  4 ++--
 src/app.py     |  2 +-
 start          | 12 ++++++------
 start-test-app | 16 ++++++++--------
 6 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/apart-core b/apart-core
index e1467cd..579a932 160000
--- a/apart-core
+++ b/apart-core
@@ -1 +1 @@
-Subproject commit e1467cdeb3fd74238e913cdd5a655750364e6e20
+Subproject commit 579a93266a1096ff76b08f5cddf68b76c26cb839
diff --git a/aur b/aur
index 283d3ca..a843ba0 160000
--- a/aur
+++ b/aur
@@ -1 +1 @@
-Subproject commit 283d3ca0591eaf414bf93a185383a6ec0e6472a1
+Subproject commit a843ba0eda117fb5f2dcd999782ec41282896426
diff --git a/build-dist b/build-dist
index 2f34484..85f2e9a 100755
--- a/build-dist
+++ b/build-dist
@@ -11,8 +11,8 @@ while test $# -gt 0; do
   esac
 done
 
-APART_CORE_VERSION="0.3.9"
-APART_CORE_SHA256='58bc9ce02cd117e6544c6826ff147bc77b9bbe973501ca6e13f5a8de3c70b455'
+APART_CORE_VERSION="0.3.10"
+APART_CORE_SHA256='32c5c58209ad6cab7bb7bc84c139782ada7f42fb68d95c46d69e72735d2b2e3c'
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 cd "$DIR"
diff --git a/src/app.py b/src/app.py
index 9a10145..e37d2d0 100755
--- a/src/app.py
+++ b/src/app.py
@@ -11,7 +11,7 @@
 from gi.repository import GLib, Gtk, Gdk
 
 # App versions, "major.minor", major => new stuff, minor => fixes
-__version__ = '0.24'
+__version__ = '0.25'
 
 
 class LoadingBody(Gtk.Grid):
diff --git a/start b/start
index fc30ba9..f87d654 100755
--- a/start
+++ b/start
@@ -4,17 +4,17 @@ set -eu
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # run doctests
-python -m doctest $dir/src/*.py
+python -m doctest "$dir"/src/*.py
 
-(cd $dir/apart-core && cargo build)
+(cd "$dir"/apart-core && cargo build)
 
 now=$(date +%Y-%m-%dT%H)
-if [ -f ~/.config/apart-gtk/history.yaml ] && [ ! -f $dir/history-backup-$now.yaml ]; then
+if [ -f ~/.config/apart-gtk/history.yaml ] && [ ! -f "$dir/history-backup-$now.yaml" ]; then
   echo "Backing up ~/.config/apart-gtk/history.yaml -> history-backup-$now.yaml"
-  cp ~/.config/apart-gtk/history.yaml $dir/history-backup-$now.yaml
+  cp ~/.config/apart-gtk/history.yaml "$dir/history-backup-$now.yaml"
 fi
 
 RUST_BACKTRACE=full \
-  APART_GTK_CORE_CMD=$dir/apart-core/target/debug/apart-core \
+  APART_GTK_CORE_CMD="$dir/apart-core/target/debug/apart-core" \
   RUST_LOG=info \
-  $dir/src/app.py
+  "$dir/src/app.py"
diff --git a/start-test-app b/start-test-app
index e9073da..8046141 100755
--- a/start-test-app
+++ b/start-test-app
@@ -4,19 +4,19 @@ set -eu
 dir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 # run doctests
-python -m doctest $dir/src/*.py
+python -m doctest "$dir"/src/*.py
 
-(cd $dir/apart-core && cargo build)
+(cd "$dir"/apart-core && cargo build)
 
 now=$(date +%Y-%m-%dT%H)
-if [ -f ~/.config/apart-gtk/history.yaml ] && [ ! -f $dir/history-backup-$now.yaml ]; then
+if [ -f ~/.config/apart-gtk/history.yaml ] && [ ! -f "$dir/history-backup-$now.yaml" ]; then
   echo "Backing up ~/.config/apart-gtk/history.yaml -> history-backup-$now.yaml"
-  cp ~/.config/apart-gtk/history.yaml $dir/history-backup-$now.yaml
+  cp ~/.config/apart-gtk/history.yaml "$dir/history-backup-$now.yaml"
 fi
 
 RUST_BACKTRACE=full \
-  APART_PARTCLONE_CMD=$dir/test/mockpcl \
-  APART_GTK_CORE_CMD=$dir/apart-core/target/debug/apart-core \
+  APART_PARTCLONE_CMD="$dir/test/mockpcl" \
+  APART_GTK_CORE_CMD="$dir/apart-core/target/debug/apart-core" \
   RUST_LOG=info \
-  APART_LSBLK_CMD=$dir/test/mocklsblk \
-  $dir/src/app.py
+  APART_LSBLK_CMD="$dir/test/mocklsblk" \
+  "$dir/src/app.py"