From baf71a133da94d3272f328eee34a13482dd1c6ba Mon Sep 17 00:00:00 2001
From: Stephen Pollard <stephen@stephentpollard.com>
Date: Fri, 22 Jul 2022 18:09:40 -0400
Subject: [PATCH 1/5] Adding validation and warning when renaming

---
 app/components/rename-dialog.hbs | 5 ++++-
 app/components/rename-dialog.js  | 7 +++++++
 app/styles/buttons.css           | 4 ++++
 3 files changed, 15 insertions(+), 1 deletion(-)

diff --git a/app/components/rename-dialog.hbs b/app/components/rename-dialog.hbs
index ec48dc6..cfc2c10 100644
--- a/app/components/rename-dialog.hbs
+++ b/app/components/rename-dialog.hbs
@@ -11,11 +11,14 @@
   {{#if this.validationError}}
     <p class="text-red-500 font-sm" >{{this.validationError}}</p>
   {{/if}}
+  {{#if this.warning}}
+    <p class="text-blue-500 font-sm" >{{this.warning}}</p>
+  {{/if}}
 
   <div class="form-actions flex">
     <span class="flex-1"></span>
     <button type="button" class="pr-4" {{on "click" @onClose}}>Cancel</button>
-    <button type="submit" class="button-primary" disabled={{false}}>
+    <button type="submit" class="button-primary" disabled={{this.validationError}}>
       Rename
     </button>
   </div>
diff --git a/app/components/rename-dialog.js b/app/components/rename-dialog.js
index 8dedccb..945fe96 100644
--- a/app/components/rename-dialog.js
+++ b/app/components/rename-dialog.js
@@ -6,6 +6,7 @@ import { inject as service } from '@ember/service';
 export default class DeleteDialog extends Component {
   @tracked newName = 'new-file';
   @tracked validationError = null;
+  @tracked warning = null;
 
   @service errors;
 
@@ -42,6 +43,12 @@ export default class DeleteDialog extends Component {
       this.validationError = null;
       this.newName = value;
     }
+    if (targetExists(value)) {
+      this.warning = "File name already exists. Warning! This will overwrite!";
+      return;
+    } else {
+      this.warning = null;
+    }
   }
 
   @action
diff --git a/app/styles/buttons.css b/app/styles/buttons.css
index 7743c3f..b03b634 100644
--- a/app/styles/buttons.css
+++ b/app/styles/buttons.css
@@ -6,6 +6,10 @@
   @apply bg-blue-700;
 }
 
+button[disabled], button[disabled]:hover {
+  @apply bg-gray-500 cursor-not-allowed;
+}
+
 .button-danger {
   @apply bg-red-500 text-white font-bold py-2 px-4 rounded;
 }

From d69582db319c649356c58c209df0bd95effcd411 Mon Sep 17 00:00:00 2001
From: Stephen Pollard <stephen@stephentpollard.com>
Date: Sat, 23 Jul 2022 13:03:38 -0400
Subject: [PATCH 2/5] Updating vm to debian buster

---
 .sandstorm/Vagrantfile          |   3 +-
 .sandstorm/build.sh             |   3 +
 .sandstorm/sandstorm-files.list | 251 ++++++--------------------------
 3 files changed, 46 insertions(+), 211 deletions(-)

diff --git a/.sandstorm/Vagrantfile b/.sandstorm/Vagrantfile
index 5567d65..0b9c45d 100644
--- a/.sandstorm/Vagrantfile
+++ b/.sandstorm/Vagrantfile
@@ -20,10 +20,11 @@ end
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Base on the Sandstorm snapshots of the official Debian 9 (stretch) box with vboxsf support.
-  config.vm.box = "debian/contrib-stretch64"
+  config.vm.box = "debian/contrib-buster64"
   config.vm.post_up_message = "Your virtual server is running at http://local.sandstorm.io:6090."
 
 
+
   if Vagrant.has_plugin?("vagrant-vbguest") then
     # vagrant-vbguest is a Vagrant plugin that upgrades
     # the version of VirtualBox Guest Additions within each
diff --git a/.sandstorm/build.sh b/.sandstorm/build.sh
index 0ea5d72..66a7749 100755
--- a/.sandstorm/build.sh
+++ b/.sandstorm/build.sh
@@ -13,3 +13,6 @@ fi
 if [ ! -d "/opt/app/dist" ]; then
     ./node_modules/.bin/ember build
 fi
+if [ ! -d "/opt/app/output" ]; then
+    yarn build-server
+fi
diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list
index bf27c1a..fa36876 100644
--- a/.sandstorm/sandstorm-files.list
+++ b/.sandstorm/sandstorm-files.list
@@ -34,7 +34,6 @@ etc/fonts/conf.d/20-unhint-small-dejavu-sans.conf
 etc/fonts/conf.d/20-unhint-small-dejavu-serif.conf
 etc/fonts/conf.d/20-unhint-small-vera.conf
 etc/fonts/conf.d/30-metric-aliases.conf
-etc/fonts/conf.d/30-urw-aliases.conf
 etc/fonts/conf.d/40-nonlatin.conf
 etc/fonts/conf.d/45-latin.conf
 etc/fonts/conf.d/49-sansserif.conf
@@ -61,75 +60,47 @@ etc/localtime
 etc/mtab
 etc/passwd
 etc/ssl/openssl.cnf
-etc/xml/catalog
 lib
-lib/x86_64-linux-gnu/ld-2.24.so
 lib/x86_64-linux-gnu/libacl.so.1
-lib/x86_64-linux-gnu/libacl.so.1.1.0
 lib/x86_64-linux-gnu/libattr.so.1
-lib/x86_64-linux-gnu/libattr.so.1.1.0
 lib/x86_64-linux-gnu/libblkid.so.1
 lib/x86_64-linux-gnu/libblkid.so.1.1.0
 lib/x86_64-linux-gnu/libbsd.so.0
-lib/x86_64-linux-gnu/libbsd.so.0.8.3
 lib/x86_64-linux-gnu/libbz2.so.1.0
 lib/x86_64-linux-gnu/libbz2.so.1.0.4
-lib/x86_64-linux-gnu/libc-2.24.so
 lib/x86_64-linux-gnu/libc.so.6
 lib/x86_64-linux-gnu/libcom_err.so.2
 lib/x86_64-linux-gnu/libcom_err.so.2.1
 lib/x86_64-linux-gnu/libdbus-1.so.3
-lib/x86_64-linux-gnu/libdbus-1.so.3.14.18
-lib/x86_64-linux-gnu/libdl-2.24.so
 lib/x86_64-linux-gnu/libdl.so.2
 lib/x86_64-linux-gnu/libexpat.so.1
-lib/x86_64-linux-gnu/libexpat.so.1.6.2
 lib/x86_64-linux-gnu/libgcc_s.so.1
 lib/x86_64-linux-gnu/libgcrypt.so.20
-lib/x86_64-linux-gnu/libgcrypt.so.20.1.6
 lib/x86_64-linux-gnu/libglib-2.0.so.0
-lib/x86_64-linux-gnu/libglib-2.0.so.0.5000.3
 lib/x86_64-linux-gnu/libgpg-error.so.0
-lib/x86_64-linux-gnu/libgpg-error.so.0.21.0
 lib/x86_64-linux-gnu/libidn.so.11
 lib/x86_64-linux-gnu/libidn.so.11.6.16
 lib/x86_64-linux-gnu/libkeyutils.so.1
-lib/x86_64-linux-gnu/libkeyutils.so.1.5
 lib/x86_64-linux-gnu/liblzma.so.5
-lib/x86_64-linux-gnu/liblzma.so.5.2.2
-lib/x86_64-linux-gnu/libm-2.24.so
 lib/x86_64-linux-gnu/libm.so.6
 lib/x86_64-linux-gnu/libmount.so.1
 lib/x86_64-linux-gnu/libmount.so.1.1.0
-lib/x86_64-linux-gnu/libnsl-2.24.so
 lib/x86_64-linux-gnu/libnsl.so.1
-lib/x86_64-linux-gnu/libnss_compat-2.24.so
 lib/x86_64-linux-gnu/libnss_compat.so.2
-lib/x86_64-linux-gnu/libnss_dns-2.24.so
 lib/x86_64-linux-gnu/libnss_dns.so.2
-lib/x86_64-linux-gnu/libnss_files-2.24.so
 lib/x86_64-linux-gnu/libnss_files.so.2
-lib/x86_64-linux-gnu/libnss_nis-2.24.so
 lib/x86_64-linux-gnu/libnss_nis.so.2
 lib/x86_64-linux-gnu/libpcre.so.3
 lib/x86_64-linux-gnu/libpcre.so.3.13.3
-lib/x86_64-linux-gnu/libpthread-2.24.so
 lib/x86_64-linux-gnu/libpthread.so.0
-lib/x86_64-linux-gnu/libresolv-2.24.so
 lib/x86_64-linux-gnu/libresolv.so.2
-lib/x86_64-linux-gnu/librt-2.24.so
 lib/x86_64-linux-gnu/librt.so.1
 lib/x86_64-linux-gnu/libselinux.so.1
 lib/x86_64-linux-gnu/libsystemd.so.0
-lib/x86_64-linux-gnu/libsystemd.so.0.17.0
-lib/x86_64-linux-gnu/libtinfo.so.5
-lib/x86_64-linux-gnu/libtinfo.so.5.9
-lib/x86_64-linux-gnu/libutil-2.24.so
 lib/x86_64-linux-gnu/libutil.so.1
 lib/x86_64-linux-gnu/libuuid.so.1
 lib/x86_64-linux-gnu/libuuid.so.1.3.0
 lib/x86_64-linux-gnu/libz.so.1
-lib/x86_64-linux-gnu/libz.so.1.2.8
 lib64
 lib64/ld-linux-x86-64.so.2
 opt
@@ -137,8 +108,8 @@ opt/app
 opt/app/.sandstorm/launcher.sh
 opt/app/CHANGELOG.md
 opt/app/app.js
-opt/app/dist/assets/davros-0eeffcdc41e6e8895d5a94773f83d33e.css
-opt/app/dist/assets/davros-be360bfd1b5950e6f2fbdafccc9c0cea.js
+opt/app/dist/assets/davros-0cbbd159b35f42145c8390dfd6f3fcf5.css
+opt/app/dist/assets/davros-7f9939be422ecc1e0737261c3c759145.js
 opt/app/dist/assets/images/default-skin.svg
 opt/app/dist/assets/vendor-5c5c81c369fc387191664156ed87b86e.css
 opt/app/dist/assets/vendor-79b51461aa8cefc8cfbdb305b88862d1.js
@@ -203,7 +174,6 @@ opt/app/sample-files/Welcome to Davros.md
 opt/app/sample-files/apollo-6.jpg
 opt/app/sample-files/pluto.jpg
 opt/app/sample-files/shuttle.jpg
-opt/app/sandstorm-integration/bin/getPublicId
 opt/app/server/api-ws.js
 opt/app/server/api/download-directory.js
 opt/app/server/api/file-upload.js
@@ -240,17 +210,21 @@ sandstorm-http-bridge-config
 sandstorm-manifest
 usr
 usr/bin/awk
+usr/bin/bash
+usr/bin/cp
 usr/bin/curl
+usr/bin/dash
+usr/bin/df
 usr/bin/du
 usr/bin/env
 usr/bin/find
 usr/bin/getconf
 usr/bin/id
 usr/bin/mawk
+usr/bin/mkdir
 usr/bin/node
-usr/bin/nodejs
 usr/bin/python3
-usr/bin/python3.5
+usr/bin/sh
 usr/bin/tail
 usr/bin/whoami
 usr/lib
@@ -358,23 +332,6 @@ usr/lib/libreoffice/program/libxsec_xmlsec.so
 usr/lib/libreoffice/program/libxsltfilterlo.so
 usr/lib/libreoffice/program/lounorc
 usr/lib/libreoffice/program/pyuno.so
-usr/lib/libreoffice/program/resource
-usr/lib/libreoffice/program/resource/analysisen-US.res
-usr/lib/libreoffice/program/resource/dateen-US.res
-usr/lib/libreoffice/program/resource/deploymenten-US.res
-usr/lib/libreoffice/program/resource/dkten-US.res
-usr/lib/libreoffice/program/resource/editengen-US.res
-usr/lib/libreoffice/program/resource/foren-US.res
-usr/lib/libreoffice/program/resource/fween-US.res
-usr/lib/libreoffice/program/resource/ofaen-US.res
-usr/lib/libreoffice/program/resource/pricingen-US.res
-usr/lib/libreoffice/program/resource/sben-US.res
-usr/lib/libreoffice/program/resource/scen-US.res
-usr/lib/libreoffice/program/resource/sden-US.res
-usr/lib/libreoffice/program/resource/sfxen-US.res
-usr/lib/libreoffice/program/resource/svten-US.res
-usr/lib/libreoffice/program/resource/svxen-US.res
-usr/lib/libreoffice/program/resource/swen-US.res
 usr/lib/libreoffice/program/services
 usr/lib/libreoffice/program/services.rdb
 usr/lib/libreoffice/program/services/pyuno.rdb
@@ -406,7 +363,6 @@ usr/lib/libreoffice/share/basic/Tools/script.xlb
 usr/lib/libreoffice/share/basic/dialog.xlc
 usr/lib/libreoffice/share/basic/script.xlc
 usr/lib/libreoffice/share/config
-usr/lib/libreoffice/share/config/images_galaxy.zip
 usr/lib/libreoffice/share/config/soffice.cfg/modules/scalc/menubar
 usr/lib/libreoffice/share/config/soffice.cfg/modules/scalc/popupmenu
 usr/lib/libreoffice/share/config/soffice.cfg/modules/scalc/statusbar
@@ -434,7 +390,6 @@ usr/lib/libreoffice/share/config/soffice.cfg/simpress/transitions.xml
 usr/lib/libreoffice/share/extensions
 usr/lib/libreoffice/share/filter/oox-drawingml-cs-presets
 usr/lib/libreoffice/share/fonts/truetype
-usr/lib/libreoffice/share/fonts/truetype/fc_local.conf
 usr/lib/libreoffice/share/palette
 usr/lib/libreoffice/share/palette/standard.sod
 usr/lib/libreoffice/share/registry
@@ -467,117 +422,38 @@ usr/lib/libreoffice/share/xslt/export/xhtml/header.xsl
 usr/lib/libreoffice/share/xslt/export/xhtml/opendoc2xhtml.xsl
 usr/lib/libreoffice/share/xslt/export/xhtml/table.xsl
 usr/lib/locale/C.UTF-8/LC_CTYPE
-usr/lib/locale/locale-archive
-usr/lib/python3.5
-usr/lib/python3.5/__pycache__/__future__.cpython-35.pyc
-usr/lib/python3.5/__pycache__/_bootlocale.cpython-35.pyc
-usr/lib/python3.5/__pycache__/_collections_abc.cpython-35.pyc
-usr/lib/python3.5/__pycache__/_sitebuiltins.cpython-35.pyc
-usr/lib/python3.5/__pycache__/_sysconfigdata.cpython-35.pyc
-usr/lib/python3.5/__pycache__/_weakrefset.cpython-35.pyc
-usr/lib/python3.5/__pycache__/abc.cpython-35.pyc
-usr/lib/python3.5/__pycache__/codecs.cpython-35.pyc
-usr/lib/python3.5/__pycache__/copy.cpython-35.pyc
-usr/lib/python3.5/__pycache__/copyreg.cpython-35.pyc
-usr/lib/python3.5/__pycache__/enum.cpython-35.pyc
-usr/lib/python3.5/__pycache__/fnmatch.cpython-35.pyc
-usr/lib/python3.5/__pycache__/functools.cpython-35.pyc
-usr/lib/python3.5/__pycache__/genericpath.cpython-35.pyc
-usr/lib/python3.5/__pycache__/getopt.cpython-35.pyc
-usr/lib/python3.5/__pycache__/gettext.cpython-35.pyc
-usr/lib/python3.5/__pycache__/glob.cpython-35.pyc
-usr/lib/python3.5/__pycache__/heapq.cpython-35.pyc
-usr/lib/python3.5/__pycache__/io.cpython-35.pyc
-usr/lib/python3.5/__pycache__/keyword.cpython-35.pyc
-usr/lib/python3.5/__pycache__/linecache.cpython-35.pyc
-usr/lib/python3.5/__pycache__/locale.cpython-35.pyc
-usr/lib/python3.5/__pycache__/operator.cpython-35.pyc
-usr/lib/python3.5/__pycache__/os.cpython-35.pyc
-usr/lib/python3.5/__pycache__/posixpath.cpython-35.pyc
-usr/lib/python3.5/__pycache__/re.cpython-35.pyc
-usr/lib/python3.5/__pycache__/reprlib.cpython-35.pyc
-usr/lib/python3.5/__pycache__/selectors.cpython-35.pyc
-usr/lib/python3.5/__pycache__/signal.cpython-35.pyc
-usr/lib/python3.5/__pycache__/site.cpython-35.pyc
-usr/lib/python3.5/__pycache__/sitecustomize.cpython-35.pyc
-usr/lib/python3.5/__pycache__/socket.cpython-35.pyc
-usr/lib/python3.5/__pycache__/sre_compile.cpython-35.pyc
-usr/lib/python3.5/__pycache__/sre_constants.cpython-35.pyc
-usr/lib/python3.5/__pycache__/sre_parse.cpython-35.pyc
-usr/lib/python3.5/__pycache__/stat.cpython-35.pyc
-usr/lib/python3.5/__pycache__/struct.cpython-35.pyc
-usr/lib/python3.5/__pycache__/subprocess.cpython-35.pyc
-usr/lib/python3.5/__pycache__/sysconfig.cpython-35.pyc
-usr/lib/python3.5/__pycache__/threading.cpython-35.pyc
-usr/lib/python3.5/__pycache__/token.cpython-35.pyc
-usr/lib/python3.5/__pycache__/tokenize.cpython-35.pyc
-usr/lib/python3.5/__pycache__/traceback.cpython-35.pyc
-usr/lib/python3.5/__pycache__/types.cpython-35.pyc
-usr/lib/python3.5/__pycache__/warnings.cpython-35.pyc
-usr/lib/python3.5/__pycache__/weakref.cpython-35.pyc
-usr/lib/python3.5/collections
-usr/lib/python3.5/collections/__pycache__/__init__.cpython-35.pyc
-usr/lib/python3.5/collections/__pycache__/abc.cpython-35.pyc
-usr/lib/python3.5/distutils
-usr/lib/python3.5/distutils/__pycache__/__init__.cpython-35.pyc
-usr/lib/python3.5/distutils/__pycache__/version.cpython-35.pyc
-usr/lib/python3.5/encodings
-usr/lib/python3.5/encodings/__pycache__/__init__.cpython-35.pyc
-usr/lib/python3.5/encodings/__pycache__/aliases.cpython-35.pyc
-usr/lib/python3.5/encodings/__pycache__/ascii.cpython-35.pyc
-usr/lib/python3.5/encodings/__pycache__/latin_1.cpython-35.pyc
-usr/lib/python3.5/encodings/__pycache__/utf_8.cpython-35.pyc
-usr/lib/python3.5/lib-dynload
-usr/lib/python3.5/plat-x86_64-linux-gnu
-usr/lib/python3.5/plat-x86_64-linux-gnu/__pycache__/_sysconfigdata_m.cpython-35.pyc
-usr/lib/python3.5/sitecustomize.py
 usr/lib/python3/dist-packages
-usr/lib/python3/dist-packages/__pycache__/uno.cpython-35.pyc
-usr/lib/python3/dist-packages/__pycache__/unohelper.cpython-35.pyc
 usr/lib/ssl/openssl.cnf
 usr/lib/x86_64-linux-gnu/gconv/gconv-modules.cache
-usr/lib/x86_64-linux-gnu/libGL.so.1
-usr/lib/x86_64-linux-gnu/libGL.so.1.2.0
-usr/lib/x86_64-linux-gnu/libGLEW.so.2.0
-usr/lib/x86_64-linux-gnu/libGLEW.so.2.0.0
-usr/lib/x86_64-linux-gnu/libGLU.so.1
-usr/lib/x86_64-linux-gnu/libGLU.so.1.3.1
+usr/lib/x86_64-linux-gnu/ld-2.28.so
 usr/lib/x86_64-linux-gnu/libICE.so.6
 usr/lib/x86_64-linux-gnu/libICE.so.6.3.0
 usr/lib/x86_64-linux-gnu/libSM.so.6
 usr/lib/x86_64-linux-gnu/libSM.so.6.0.1
-usr/lib/x86_64-linux-gnu/libX11-xcb.so.1
-usr/lib/x86_64-linux-gnu/libX11-xcb.so.1.0.0
 usr/lib/x86_64-linux-gnu/libX11.so.6
 usr/lib/x86_64-linux-gnu/libX11.so.6.3.0
 usr/lib/x86_64-linux-gnu/libXau.so.6
 usr/lib/x86_64-linux-gnu/libXau.so.6.0.0
-usr/lib/x86_64-linux-gnu/libXdamage.so.1
-usr/lib/x86_64-linux-gnu/libXdamage.so.1.1.0
 usr/lib/x86_64-linux-gnu/libXdmcp.so.6
 usr/lib/x86_64-linux-gnu/libXdmcp.so.6.0.0
 usr/lib/x86_64-linux-gnu/libXext.so.6
 usr/lib/x86_64-linux-gnu/libXext.so.6.4.0
-usr/lib/x86_64-linux-gnu/libXfixes.so.3
-usr/lib/x86_64-linux-gnu/libXfixes.so.3.1.0
 usr/lib/x86_64-linux-gnu/libXrender.so.1
 usr/lib/x86_64-linux-gnu/libXrender.so.1.3.0
-usr/lib/x86_64-linux-gnu/libXxf86vm.so.1
-usr/lib/x86_64-linux-gnu/libXxf86vm.so.1.0.0
 usr/lib/x86_64-linux-gnu/libabw-0.1.so.1
-usr/lib/x86_64-linux-gnu/libabw-0.1.so.1.0.1
+usr/lib/x86_64-linux-gnu/libacl.so.1
+usr/lib/x86_64-linux-gnu/libacl.so.1.1.2253
 usr/lib/x86_64-linux-gnu/libassuan.so.0
+usr/lib/x86_64-linux-gnu/libattr.so.1
+usr/lib/x86_64-linux-gnu/libattr.so.1.1.2448
 usr/lib/x86_64-linux-gnu/libavahi-client.so.3
 usr/lib/x86_64-linux-gnu/libavahi-client.so.3.2.9
 usr/lib/x86_64-linux-gnu/libavahi-common.so.3
 usr/lib/x86_64-linux-gnu/libavahi-common.so.3.5.3
-usr/lib/x86_64-linux-gnu/libboost_filesystem.so.1.62.0
-usr/lib/x86_64-linux-gnu/libboost_iostreams.so.1.62.0
-usr/lib/x86_64-linux-gnu/libboost_system.so.1.62.0
+usr/lib/x86_64-linux-gnu/libc-2.28.so
+usr/lib/x86_64-linux-gnu/libc.so.6
 usr/lib/x86_64-linux-gnu/libcairo.so.2
-usr/lib/x86_64-linux-gnu/libcairo.so.2.11400.8
 usr/lib/x86_64-linux-gnu/libcdr-0.1.so.1
-usr/lib/x86_64-linux-gnu/libcdr-0.1.so.1.0.3
 usr/lib/x86_64-linux-gnu/libclucene-contribs-lib.so.1
 usr/lib/x86_64-linux-gnu/libclucene-contribs-lib.so.2.3.3.4
 usr/lib/x86_64-linux-gnu/libclucene-core.so.1
@@ -586,67 +462,41 @@ usr/lib/x86_64-linux-gnu/libclucene-shared.so.1
 usr/lib/x86_64-linux-gnu/libclucene-shared.so.2.3.3.4
 usr/lib/x86_64-linux-gnu/libcups.so.2
 usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4
-usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4.4.0
 usr/lib/x86_64-linux-gnu/libcurl.so.4
 usr/lib/x86_64-linux-gnu/libdb-5.3.so
 usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2
-usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2.3.3
 usr/lib/x86_64-linux-gnu/libdconf.so.1
 usr/lib/x86_64-linux-gnu/libdconf.so.1.0.0
-usr/lib/x86_64-linux-gnu/libdrm.so.2
-usr/lib/x86_64-linux-gnu/libdrm.so.2.4.0
+usr/lib/x86_64-linux-gnu/libdl-2.28.so
+usr/lib/x86_64-linux-gnu/libdl.so.2
 usr/lib/x86_64-linux-gnu/libe-book-0.1.so.1
-usr/lib/x86_64-linux-gnu/libe-book-0.1.so.1.0.2
 usr/lib/x86_64-linux-gnu/libeot.so.0
 usr/lib/x86_64-linux-gnu/libeot.so.0.0.0
 usr/lib/x86_64-linux-gnu/libetonyek-0.1.so.1
-usr/lib/x86_64-linux-gnu/libetonyek-0.1.so.1.0.6
 usr/lib/x86_64-linux-gnu/libexslt.so.0
-usr/lib/x86_64-linux-gnu/libexslt.so.0.8.17
 usr/lib/x86_64-linux-gnu/libffi.so.6
 usr/lib/x86_64-linux-gnu/libffi.so.6.0.4
 usr/lib/x86_64-linux-gnu/libfontconfig.so.1
-usr/lib/x86_64-linux-gnu/libfontconfig.so.1.8.0
 usr/lib/x86_64-linux-gnu/libfreehand-0.1.so.1
-usr/lib/x86_64-linux-gnu/libfreehand-0.1.so.1.0.1
 usr/lib/x86_64-linux-gnu/libfreetype.so.6
-usr/lib/x86_64-linux-gnu/libfreetype.so.6.12.3
+usr/lib/x86_64-linux-gnu/libgcc_s.so.1
 usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
-usr/lib/x86_64-linux-gnu/libgio-2.0.so.0.5000.3
-usr/lib/x86_64-linux-gnu/libglapi.so.0
-usr/lib/x86_64-linux-gnu/libglapi.so.0.0.0
 usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0
-usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0.5000.3
 usr/lib/x86_64-linux-gnu/libgmp.so.10
 usr/lib/x86_64-linux-gnu/libgmp.so.10.3.2
 usr/lib/x86_64-linux-gnu/libgnutls.so.30
-usr/lib/x86_64-linux-gnu/libgnutls.so.30.13.1
 usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
-usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0.5000.3
 usr/lib/x86_64-linux-gnu/libgomp.so.1
 usr/lib/x86_64-linux-gnu/libgomp.so.1.0.0
 usr/lib/x86_64-linux-gnu/libgraphite2.so.3
-usr/lib/x86_64-linux-gnu/libgraphite2.so.3.0.1
 usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2
 usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2.2
 usr/lib/x86_64-linux-gnu/libharfbuzz-icu.so.0
-usr/lib/x86_64-linux-gnu/libharfbuzz-icu.so.0.10400.2
 usr/lib/x86_64-linux-gnu/libharfbuzz.so.0
-usr/lib/x86_64-linux-gnu/libharfbuzz.so.0.10400.2
 usr/lib/x86_64-linux-gnu/libhogweed.so.4
-usr/lib/x86_64-linux-gnu/libhogweed.so.4.3
-usr/lib/x86_64-linux-gnu/libhunspell-1.4.so.0
-usr/lib/x86_64-linux-gnu/libhunspell-1.4.so.0.0.0
 usr/lib/x86_64-linux-gnu/libhyphen.so.0
 usr/lib/x86_64-linux-gnu/libhyphen.so.0.3.0
-usr/lib/x86_64-linux-gnu/libicudata.so.57
-usr/lib/x86_64-linux-gnu/libicudata.so.57.1
-usr/lib/x86_64-linux-gnu/libicui18n.so.57
-usr/lib/x86_64-linux-gnu/libicui18n.so.57.1
-usr/lib/x86_64-linux-gnu/libicuuc.so.57
-usr/lib/x86_64-linux-gnu/libicuuc.so.57.1
 usr/lib/x86_64-linux-gnu/libidn2.so.0
-usr/lib/x86_64-linux-gnu/libidn2.so.0.1.4
 usr/lib/x86_64-linux-gnu/libjpeg.so.62
 usr/lib/x86_64-linux-gnu/libjpeg.so.62.2.0
 usr/lib/x86_64-linux-gnu/libk5crypto.so.3
@@ -658,55 +508,53 @@ usr/lib/x86_64-linux-gnu/libkrb5support.so.0.1
 usr/lib/x86_64-linux-gnu/liblangtag.so.1
 usr/lib/x86_64-linux-gnu/liblangtag.so.1.4.1
 usr/lib/x86_64-linux-gnu/liblber-2.4.so.2
-usr/lib/x86_64-linux-gnu/liblber-2.4.so.2.10.7
 usr/lib/x86_64-linux-gnu/liblcms2.so.2
 usr/lib/x86_64-linux-gnu/liblcms2.so.2.0.8
 usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2
-usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2.10.7
 usr/lib/x86_64-linux-gnu/libltdl.so.7
 usr/lib/x86_64-linux-gnu/libltdl.so.7.3.1
 usr/lib/x86_64-linux-gnu/liblz4.so.1
-usr/lib/x86_64-linux-gnu/liblz4.so.1.7.1
+usr/lib/x86_64-linux-gnu/libm-2.28.so
+usr/lib/x86_64-linux-gnu/libm.so.6
 usr/lib/x86_64-linux-gnu/libmhash.so.2
 usr/lib/x86_64-linux-gnu/libmhash.so.2.0.1
 usr/lib/x86_64-linux-gnu/libmspub-0.1.so.1
-usr/lib/x86_64-linux-gnu/libmspub-0.1.so.1.0.2
 usr/lib/x86_64-linux-gnu/libmwaw-0.3.so.3
-usr/lib/x86_64-linux-gnu/libmwaw-0.3.so.3.0.9
 usr/lib/x86_64-linux-gnu/libmythes-1.2.so.0
 usr/lib/x86_64-linux-gnu/libmythes-1.2.so.0.0.0
 usr/lib/x86_64-linux-gnu/libnettle.so.6
-usr/lib/x86_64-linux-gnu/libnettle.so.6.3
 usr/lib/x86_64-linux-gnu/libnghttp2.so.14
-usr/lib/x86_64-linux-gnu/libnghttp2.so.14.12.3
+usr/lib/x86_64-linux-gnu/libnsl-2.28.so
+usr/lib/x86_64-linux-gnu/libnsl.so.1
 usr/lib/x86_64-linux-gnu/libnspr4.so
 usr/lib/x86_64-linux-gnu/libnss3.so
+usr/lib/x86_64-linux-gnu/libnss_compat-2.28.so
+usr/lib/x86_64-linux-gnu/libnss_compat.so.2
+usr/lib/x86_64-linux-gnu/libnss_files-2.28.so
+usr/lib/x86_64-linux-gnu/libnss_files.so.2
+usr/lib/x86_64-linux-gnu/libnss_nis-2.28.so
+usr/lib/x86_64-linux-gnu/libnss_nis.so.2
 usr/lib/x86_64-linux-gnu/libnssutil3.so
 usr/lib/x86_64-linux-gnu/libodfgen-0.1.so.1
-usr/lib/x86_64-linux-gnu/libodfgen-0.1.so.1.0.6
-usr/lib/x86_64-linux-gnu/liborcus-0.11.so.0
-usr/lib/x86_64-linux-gnu/liborcus-0.11.so.0.0.0
-usr/lib/x86_64-linux-gnu/liborcus-parser-0.11.so.0
-usr/lib/x86_64-linux-gnu/liborcus-parser-0.11.so.0.0.0
 usr/lib/x86_64-linux-gnu/libp11-kit.so.0
-usr/lib/x86_64-linux-gnu/libp11-kit.so.0.2.0
 usr/lib/x86_64-linux-gnu/libpagemaker-0.0.so.0
-usr/lib/x86_64-linux-gnu/libpagemaker-0.0.so.0.0.3
+usr/lib/x86_64-linux-gnu/libpcre.so.3
+usr/lib/x86_64-linux-gnu/libpcre.so.3.13.3
 usr/lib/x86_64-linux-gnu/libpixman-1.so.0
-usr/lib/x86_64-linux-gnu/libpixman-1.so.0.34.0
 usr/lib/x86_64-linux-gnu/libplc4.so
 usr/lib/x86_64-linux-gnu/libplds4.so
 usr/lib/x86_64-linux-gnu/libpng16.so.16
-usr/lib/x86_64-linux-gnu/libpng16.so.16.28.0
 usr/lib/x86_64-linux-gnu/libpsl.so.5
-usr/lib/x86_64-linux-gnu/libpsl.so.5.1.1
-usr/lib/x86_64-linux-gnu/libpython3.5m.so.1.0
+usr/lib/x86_64-linux-gnu/libpthread-2.28.so
+usr/lib/x86_64-linux-gnu/libpthread.so.0
 usr/lib/x86_64-linux-gnu/libraptor2.so.0
 usr/lib/x86_64-linux-gnu/libraptor2.so.0.0.0
 usr/lib/x86_64-linux-gnu/librasqal.so.3
 usr/lib/x86_64-linux-gnu/librasqal.so.3.0.0
 usr/lib/x86_64-linux-gnu/librdf.so.0
 usr/lib/x86_64-linux-gnu/librdf.so.0.0.0
+usr/lib/x86_64-linux-gnu/libresolv-2.28.so
+usr/lib/x86_64-linux-gnu/libresolv.so.2
 usr/lib/x86_64-linux-gnu/librevenge-0.0.so.0
 usr/lib/x86_64-linux-gnu/librevenge-0.0.so.0.0.4
 usr/lib/x86_64-linux-gnu/librevenge-stream-0.0.so.0
@@ -714,51 +562,34 @@ usr/lib/x86_64-linux-gnu/librevenge-stream-0.0.so.0.0.4
 usr/lib/x86_64-linux-gnu/librtmp.so.1
 usr/lib/x86_64-linux-gnu/libsasl2.so.2
 usr/lib/x86_64-linux-gnu/libsasl2.so.2.0.25
+usr/lib/x86_64-linux-gnu/libselinux.so.1
 usr/lib/x86_64-linux-gnu/libsmime3.so
 usr/lib/x86_64-linux-gnu/libssh2.so.1
 usr/lib/x86_64-linux-gnu/libssh2.so.1.0.1
 usr/lib/x86_64-linux-gnu/libssl3.so
 usr/lib/x86_64-linux-gnu/libstdc++.so.6
-usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.22
+usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.25
 usr/lib/x86_64-linux-gnu/libtasn1.so.6
-usr/lib/x86_64-linux-gnu/libtasn1.so.6.5.3
-usr/lib/x86_64-linux-gnu/libunistring.so.0
-usr/lib/x86_64-linux-gnu/libunistring.so.0.1.2
+usr/lib/x86_64-linux-gnu/libtinfo.so.6
+usr/lib/x86_64-linux-gnu/libtinfo.so.6.1
 usr/lib/x86_64-linux-gnu/libvisio-0.1.so.1
-usr/lib/x86_64-linux-gnu/libvisio-0.1.so.1.0.5
 usr/lib/x86_64-linux-gnu/libwpd-0.10.so.10
-usr/lib/x86_64-linux-gnu/libwpd-0.10.so.10.0.1
 usr/lib/x86_64-linux-gnu/libwpg-0.3.so.3
-usr/lib/x86_64-linux-gnu/libwpg-0.3.so.3.0.1
 usr/lib/x86_64-linux-gnu/libwps-0.4.so.4
-usr/lib/x86_64-linux-gnu/libwps-0.4.so.4.0.5
-usr/lib/x86_64-linux-gnu/libxcb-dri2.so.0
-usr/lib/x86_64-linux-gnu/libxcb-dri2.so.0.0.0
-usr/lib/x86_64-linux-gnu/libxcb-dri3.so.0
-usr/lib/x86_64-linux-gnu/libxcb-dri3.so.0.0.0
-usr/lib/x86_64-linux-gnu/libxcb-glx.so.0
-usr/lib/x86_64-linux-gnu/libxcb-glx.so.0.0.0
-usr/lib/x86_64-linux-gnu/libxcb-present.so.0
-usr/lib/x86_64-linux-gnu/libxcb-present.so.0.0.0
 usr/lib/x86_64-linux-gnu/libxcb-render.so.0
 usr/lib/x86_64-linux-gnu/libxcb-render.so.0.0.0
 usr/lib/x86_64-linux-gnu/libxcb-shm.so.0
 usr/lib/x86_64-linux-gnu/libxcb-shm.so.0.0.0
-usr/lib/x86_64-linux-gnu/libxcb-sync.so.1
-usr/lib/x86_64-linux-gnu/libxcb-sync.so.1.0.0
 usr/lib/x86_64-linux-gnu/libxcb.so.1
 usr/lib/x86_64-linux-gnu/libxcb.so.1.1.0
 usr/lib/x86_64-linux-gnu/libxml2.so.2
 usr/lib/x86_64-linux-gnu/libxml2.so.2.9.4
-usr/lib/x86_64-linux-gnu/libxshmfence.so.1
-usr/lib/x86_64-linux-gnu/libxshmfence.so.1.0.0
 usr/lib/x86_64-linux-gnu/libxslt.so.1
-usr/lib/x86_64-linux-gnu/libxslt.so.1.1.29
 usr/lib/x86_64-linux-gnu/libyajl.so.2
 usr/lib/x86_64-linux-gnu/libyajl.so.2.1.0
+usr/lib64/ld-linux-x86-64.so.2
 usr/local
 usr/local/lib
-usr/local/lib/python3.5/dist-packages
 usr/local/share/fonts
 usr/share/fontconfig/conf.avail
 usr/share/fontconfig/conf.avail/10-autohint.conf
@@ -775,7 +606,6 @@ usr/share/fontconfig/conf.avail/11-lcdfilter-light.conf
 usr/share/fontconfig/conf.avail/20-unhint-small-vera.conf
 usr/share/fontconfig/conf.avail/25-unhint-nonlatin.conf
 usr/share/fontconfig/conf.avail/30-metric-aliases.conf
-usr/share/fontconfig/conf.avail/30-urw-aliases.conf
 usr/share/fontconfig/conf.avail/40-nonlatin.conf
 usr/share/fontconfig/conf.avail/45-latin.conf
 usr/share/fontconfig/conf.avail/49-sansserif.conf
@@ -816,7 +646,6 @@ usr/share/liblangtag/common/bcp47/variant.xml
 usr/share/liblangtag/common/supplemental/likelySubtags.xml
 usr/share/liblangtag/common/supplemental/supplementalMetadata.xml
 usr/share/liblangtag/language-subtag-registry.xml
-usr/share/libreoffice/share/config/images_galaxy.zip
 usr/share/locale/locale.alias
 usr/share/zoneinfo
 usr/share/zoneinfo/Africa
@@ -1220,6 +1049,7 @@ usr/share/zoneinfo/Eire
 usr/share/zoneinfo/Etc
 usr/share/zoneinfo/Etc/GMT
 usr/share/zoneinfo/Etc/GMT+0
+usr/share/zoneinfo/Etc/UTC
 usr/share/zoneinfo/Europe/Nicosia
 usr/share/zoneinfo/GMT
 usr/share/zoneinfo/GMT+0
@@ -1240,4 +1070,5 @@ usr/share/zoneinfo/ROC
 usr/share/zoneinfo/ROK
 usr/share/zoneinfo/Singapore
 usr/share/zoneinfo/Turkey
+usr/share/zoneinfo/UCT
 usr/share/zoneinfo/posixrules

From b3119e2de28d197ff87d3dfbb252bdc9975d76f7 Mon Sep 17 00:00:00 2001
From: Stephen Pollard <stephen@stephentpollard.com>
Date: Sun, 24 Jul 2022 15:50:40 -0400
Subject: [PATCH 3/5] Updated to bullseye

---
 .sandstorm/Vagrantfile          |  2 +-
 .sandstorm/sandstorm-files.list | 52 +++++++--------------------------
 .sandstorm/setup.sh             |  6 ++--
 3 files changed, 15 insertions(+), 45 deletions(-)

diff --git a/.sandstorm/Vagrantfile b/.sandstorm/Vagrantfile
index 0b9c45d..6089952 100644
--- a/.sandstorm/Vagrantfile
+++ b/.sandstorm/Vagrantfile
@@ -20,7 +20,7 @@ end
 
 Vagrant.configure(VAGRANTFILE_API_VERSION) do |config|
   # Base on the Sandstorm snapshots of the official Debian 9 (stretch) box with vboxsf support.
-  config.vm.box = "debian/contrib-buster64"
+  config.vm.box = "debian/bullseye64"
   config.vm.post_up_message = "Your virtual server is running at http://local.sandstorm.io:6090."
 
 
diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list
index fa36876..6a214f9 100644
--- a/.sandstorm/sandstorm-files.list
+++ b/.sandstorm/sandstorm-files.list
@@ -78,8 +78,6 @@ lib/x86_64-linux-gnu/libgcc_s.so.1
 lib/x86_64-linux-gnu/libgcrypt.so.20
 lib/x86_64-linux-gnu/libglib-2.0.so.0
 lib/x86_64-linux-gnu/libgpg-error.so.0
-lib/x86_64-linux-gnu/libidn.so.11
-lib/x86_64-linux-gnu/libidn.so.11.6.16
 lib/x86_64-linux-gnu/libkeyutils.so.1
 lib/x86_64-linux-gnu/liblzma.so.5
 lib/x86_64-linux-gnu/libm.so.6
@@ -89,7 +87,6 @@ lib/x86_64-linux-gnu/libnsl.so.1
 lib/x86_64-linux-gnu/libnss_compat.so.2
 lib/x86_64-linux-gnu/libnss_dns.so.2
 lib/x86_64-linux-gnu/libnss_files.so.2
-lib/x86_64-linux-gnu/libnss_nis.so.2
 lib/x86_64-linux-gnu/libpcre.so.3
 lib/x86_64-linux-gnu/libpcre.so.3.13.3
 lib/x86_64-linux-gnu/libpthread.so.0
@@ -264,29 +261,20 @@ usr/lib/libreoffice/program/libdbalo.so
 usr/lib/libreoffice/program/libdict_zh.so
 usr/lib/libreoffice/program/libembobj.so
 usr/lib/libreoffice/program/libemboleobj.so
-usr/lib/libreoffice/program/libevtattlo.so
 usr/lib/libreoffice/program/libexpwraplo.so
-usr/lib/libreoffice/program/libforlo.so
-usr/lib/libreoffice/program/libforuilo.so
-usr/lib/libreoffice/program/libfrmlo.so
-usr/lib/libreoffice/program/libfwllo.so
 usr/lib/libreoffice/program/libgcc3_uno.so
 usr/lib/libreoffice/program/libgielo.so
-usr/lib/libreoffice/program/libhyphenlo.so
 usr/lib/libreoffice/program/libintrospectionlo.so
 usr/lib/libreoffice/program/libinvocadaptlo.so
 usr/lib/libreoffice/program/libinvocationlo.so
-usr/lib/libreoffice/program/libiolo.so
 usr/lib/libreoffice/program/libjvmaccesslo.so
 usr/lib/libreoffice/program/libjvmfwklo.so
-usr/lib/libreoffice/program/liblnthlo.so
 usr/lib/libreoffice/program/liblocaledata_en.so
 usr/lib/libreoffice/program/liblocaledata_es.so
 usr/lib/libreoffice/program/liblocaledata_euro.so
 usr/lib/libreoffice/program/liblocaledata_others.so
 usr/lib/libreoffice/program/libmergedlo.so
 usr/lib/libreoffice/program/libmswordlo.so
-usr/lib/libreoffice/program/liboffacclo.so
 usr/lib/libreoffice/program/libooxlo.so
 usr/lib/libreoffice/program/libpricinglo.so
 usr/lib/libreoffice/program/libprotocolhandlerlo.so
@@ -299,7 +287,6 @@ usr/lib/libreoffice/program/libscfiltlo.so
 usr/lib/libreoffice/program/libsclo.so
 usr/lib/libreoffice/program/libscnlo.so
 usr/lib/libreoffice/program/libsdlo.so
-usr/lib/libreoffice/program/libspelllo.so
 usr/lib/libreoffice/program/libstocserviceslo.so
 usr/lib/libreoffice/program/libstoragefdlo.so
 usr/lib/libreoffice/program/libstorelo.so
@@ -307,13 +294,11 @@ usr/lib/libreoffice/program/libswdlo.so
 usr/lib/libreoffice/program/libswlo.so
 usr/lib/libreoffice/program/libt602filterlo.so
 usr/lib/libreoffice/program/libucppkg1.so
-usr/lib/libreoffice/program/libucptdoc1lo.so
 usr/lib/libreoffice/program/libuno_cppu.so.3
 usr/lib/libreoffice/program/libuno_cppuhelpergcc3.so.3
 usr/lib/libreoffice/program/libuno_sal.so.3
 usr/lib/libreoffice/program/libuno_salhelpergcc3.so.3
 usr/lib/libreoffice/program/libunoidllo.so
-usr/lib/libreoffice/program/libunordflo.so
 usr/lib/libreoffice/program/libuuresolverlo.so
 usr/lib/libreoffice/program/libvbaeventslo.so
 usr/lib/libreoffice/program/libvbahelperlo.so
@@ -425,13 +410,12 @@ usr/lib/locale/C.UTF-8/LC_CTYPE
 usr/lib/python3/dist-packages
 usr/lib/ssl/openssl.cnf
 usr/lib/x86_64-linux-gnu/gconv/gconv-modules.cache
-usr/lib/x86_64-linux-gnu/ld-2.28.so
+usr/lib/x86_64-linux-gnu/ld-2.31.so
 usr/lib/x86_64-linux-gnu/libICE.so.6
 usr/lib/x86_64-linux-gnu/libICE.so.6.3.0
 usr/lib/x86_64-linux-gnu/libSM.so.6
 usr/lib/x86_64-linux-gnu/libSM.so.6.0.1
 usr/lib/x86_64-linux-gnu/libX11.so.6
-usr/lib/x86_64-linux-gnu/libX11.so.6.3.0
 usr/lib/x86_64-linux-gnu/libXau.so.6
 usr/lib/x86_64-linux-gnu/libXau.so.6.0.0
 usr/lib/x86_64-linux-gnu/libXdmcp.so.6
@@ -449,8 +433,7 @@ usr/lib/x86_64-linux-gnu/libattr.so.1.1.2448
 usr/lib/x86_64-linux-gnu/libavahi-client.so.3
 usr/lib/x86_64-linux-gnu/libavahi-client.so.3.2.9
 usr/lib/x86_64-linux-gnu/libavahi-common.so.3
-usr/lib/x86_64-linux-gnu/libavahi-common.so.3.5.3
-usr/lib/x86_64-linux-gnu/libc-2.28.so
+usr/lib/x86_64-linux-gnu/libc-2.31.so
 usr/lib/x86_64-linux-gnu/libc.so.6
 usr/lib/x86_64-linux-gnu/libcairo.so.2
 usr/lib/x86_64-linux-gnu/libcdr-0.1.so.1
@@ -464,18 +447,15 @@ usr/lib/x86_64-linux-gnu/libcups.so.2
 usr/lib/x86_64-linux-gnu/libcurl-gnutls.so.4
 usr/lib/x86_64-linux-gnu/libcurl.so.4
 usr/lib/x86_64-linux-gnu/libdb-5.3.so
-usr/lib/x86_64-linux-gnu/libdbus-glib-1.so.2
 usr/lib/x86_64-linux-gnu/libdconf.so.1
 usr/lib/x86_64-linux-gnu/libdconf.so.1.0.0
-usr/lib/x86_64-linux-gnu/libdl-2.28.so
+usr/lib/x86_64-linux-gnu/libdl-2.31.so
 usr/lib/x86_64-linux-gnu/libdl.so.2
 usr/lib/x86_64-linux-gnu/libe-book-0.1.so.1
 usr/lib/x86_64-linux-gnu/libeot.so.0
 usr/lib/x86_64-linux-gnu/libeot.so.0.0.0
 usr/lib/x86_64-linux-gnu/libetonyek-0.1.so.1
 usr/lib/x86_64-linux-gnu/libexslt.so.0
-usr/lib/x86_64-linux-gnu/libffi.so.6
-usr/lib/x86_64-linux-gnu/libffi.so.6.0.4
 usr/lib/x86_64-linux-gnu/libfontconfig.so.1
 usr/lib/x86_64-linux-gnu/libfreehand-0.1.so.1
 usr/lib/x86_64-linux-gnu/libfreetype.so.6
@@ -483,7 +463,6 @@ usr/lib/x86_64-linux-gnu/libgcc_s.so.1
 usr/lib/x86_64-linux-gnu/libgio-2.0.so.0
 usr/lib/x86_64-linux-gnu/libgmodule-2.0.so.0
 usr/lib/x86_64-linux-gnu/libgmp.so.10
-usr/lib/x86_64-linux-gnu/libgmp.so.10.3.2
 usr/lib/x86_64-linux-gnu/libgnutls.so.30
 usr/lib/x86_64-linux-gnu/libgobject-2.0.so.0
 usr/lib/x86_64-linux-gnu/libgomp.so.1
@@ -493,12 +472,10 @@ usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2
 usr/lib/x86_64-linux-gnu/libgssapi_krb5.so.2.2
 usr/lib/x86_64-linux-gnu/libharfbuzz-icu.so.0
 usr/lib/x86_64-linux-gnu/libharfbuzz.so.0
-usr/lib/x86_64-linux-gnu/libhogweed.so.4
 usr/lib/x86_64-linux-gnu/libhyphen.so.0
 usr/lib/x86_64-linux-gnu/libhyphen.so.0.3.0
 usr/lib/x86_64-linux-gnu/libidn2.so.0
 usr/lib/x86_64-linux-gnu/libjpeg.so.62
-usr/lib/x86_64-linux-gnu/libjpeg.so.62.2.0
 usr/lib/x86_64-linux-gnu/libk5crypto.so.3
 usr/lib/x86_64-linux-gnu/libk5crypto.so.3.1
 usr/lib/x86_64-linux-gnu/libkrb5.so.3
@@ -509,12 +486,11 @@ usr/lib/x86_64-linux-gnu/liblangtag.so.1
 usr/lib/x86_64-linux-gnu/liblangtag.so.1.4.1
 usr/lib/x86_64-linux-gnu/liblber-2.4.so.2
 usr/lib/x86_64-linux-gnu/liblcms2.so.2
-usr/lib/x86_64-linux-gnu/liblcms2.so.2.0.8
 usr/lib/x86_64-linux-gnu/libldap_r-2.4.so.2
 usr/lib/x86_64-linux-gnu/libltdl.so.7
 usr/lib/x86_64-linux-gnu/libltdl.so.7.3.1
 usr/lib/x86_64-linux-gnu/liblz4.so.1
-usr/lib/x86_64-linux-gnu/libm-2.28.so
+usr/lib/x86_64-linux-gnu/libm-2.31.so
 usr/lib/x86_64-linux-gnu/libm.so.6
 usr/lib/x86_64-linux-gnu/libmhash.so.2
 usr/lib/x86_64-linux-gnu/libmhash.so.2.0.1
@@ -522,30 +498,27 @@ usr/lib/x86_64-linux-gnu/libmspub-0.1.so.1
 usr/lib/x86_64-linux-gnu/libmwaw-0.3.so.3
 usr/lib/x86_64-linux-gnu/libmythes-1.2.so.0
 usr/lib/x86_64-linux-gnu/libmythes-1.2.so.0.0.0
-usr/lib/x86_64-linux-gnu/libnettle.so.6
 usr/lib/x86_64-linux-gnu/libnghttp2.so.14
-usr/lib/x86_64-linux-gnu/libnsl-2.28.so
 usr/lib/x86_64-linux-gnu/libnsl.so.1
 usr/lib/x86_64-linux-gnu/libnspr4.so
 usr/lib/x86_64-linux-gnu/libnss3.so
-usr/lib/x86_64-linux-gnu/libnss_compat-2.28.so
 usr/lib/x86_64-linux-gnu/libnss_compat.so.2
-usr/lib/x86_64-linux-gnu/libnss_files-2.28.so
+usr/lib/x86_64-linux-gnu/libnss_files-2.31.so
 usr/lib/x86_64-linux-gnu/libnss_files.so.2
-usr/lib/x86_64-linux-gnu/libnss_nis-2.28.so
-usr/lib/x86_64-linux-gnu/libnss_nis.so.2
 usr/lib/x86_64-linux-gnu/libnssutil3.so
 usr/lib/x86_64-linux-gnu/libodfgen-0.1.so.1
 usr/lib/x86_64-linux-gnu/libp11-kit.so.0
 usr/lib/x86_64-linux-gnu/libpagemaker-0.0.so.0
 usr/lib/x86_64-linux-gnu/libpcre.so.3
 usr/lib/x86_64-linux-gnu/libpcre.so.3.13.3
+usr/lib/x86_64-linux-gnu/libpcre2-8.so.0
+usr/lib/x86_64-linux-gnu/libpcre2-8.so.0.10.1
 usr/lib/x86_64-linux-gnu/libpixman-1.so.0
 usr/lib/x86_64-linux-gnu/libplc4.so
 usr/lib/x86_64-linux-gnu/libplds4.so
 usr/lib/x86_64-linux-gnu/libpng16.so.16
 usr/lib/x86_64-linux-gnu/libpsl.so.5
-usr/lib/x86_64-linux-gnu/libpthread-2.28.so
+usr/lib/x86_64-linux-gnu/libpthread-2.31.so
 usr/lib/x86_64-linux-gnu/libpthread.so.0
 usr/lib/x86_64-linux-gnu/libraptor2.so.0
 usr/lib/x86_64-linux-gnu/libraptor2.so.0.0.0
@@ -553,7 +526,7 @@ usr/lib/x86_64-linux-gnu/librasqal.so.3
 usr/lib/x86_64-linux-gnu/librasqal.so.3.0.0
 usr/lib/x86_64-linux-gnu/librdf.so.0
 usr/lib/x86_64-linux-gnu/librdf.so.0.0.0
-usr/lib/x86_64-linux-gnu/libresolv-2.28.so
+usr/lib/x86_64-linux-gnu/libresolv-2.31.so
 usr/lib/x86_64-linux-gnu/libresolv.so.2
 usr/lib/x86_64-linux-gnu/librevenge-0.0.so.0
 usr/lib/x86_64-linux-gnu/librevenge-0.0.so.0.0.4
@@ -568,10 +541,10 @@ usr/lib/x86_64-linux-gnu/libssh2.so.1
 usr/lib/x86_64-linux-gnu/libssh2.so.1.0.1
 usr/lib/x86_64-linux-gnu/libssl3.so
 usr/lib/x86_64-linux-gnu/libstdc++.so.6
-usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.25
+usr/lib/x86_64-linux-gnu/libstdc++.so.6.0.28
 usr/lib/x86_64-linux-gnu/libtasn1.so.6
 usr/lib/x86_64-linux-gnu/libtinfo.so.6
-usr/lib/x86_64-linux-gnu/libtinfo.so.6.1
+usr/lib/x86_64-linux-gnu/libtinfo.so.6.2
 usr/lib/x86_64-linux-gnu/libvisio-0.1.so.1
 usr/lib/x86_64-linux-gnu/libwpd-0.10.so.10
 usr/lib/x86_64-linux-gnu/libwpg-0.3.so.3
@@ -583,7 +556,6 @@ usr/lib/x86_64-linux-gnu/libxcb-shm.so.0.0.0
 usr/lib/x86_64-linux-gnu/libxcb.so.1
 usr/lib/x86_64-linux-gnu/libxcb.so.1.1.0
 usr/lib/x86_64-linux-gnu/libxml2.so.2
-usr/lib/x86_64-linux-gnu/libxml2.so.2.9.4
 usr/lib/x86_64-linux-gnu/libxslt.so.1
 usr/lib/x86_64-linux-gnu/libyajl.so.2
 usr/lib/x86_64-linux-gnu/libyajl.so.2.1.0
@@ -630,8 +602,6 @@ usr/share/fonts/truetype/dejavu/DejaVuSansMono-Bold.ttf
 usr/share/fonts/truetype/dejavu/DejaVuSansMono.ttf
 usr/share/fonts/truetype/dejavu/DejaVuSerif-Bold.ttf
 usr/share/fonts/truetype/dejavu/DejaVuSerif.ttf
-usr/share/fonts/truetype/openoffice
-usr/share/fonts/truetype/openoffice/opens___.ttf
 usr/share/liblangtag/common/bcp47/calendar.xml
 usr/share/liblangtag/common/bcp47/collation.xml
 usr/share/liblangtag/common/bcp47/currency.xml
diff --git a/.sandstorm/setup.sh b/.sandstorm/setup.sh
index 7047af0..c1ef2e5 100755
--- a/.sandstorm/setup.sh
+++ b/.sandstorm/setup.sh
@@ -7,10 +7,10 @@ export DEBIAN_FRONTEND=noninteractive
 
 curl -sL https://deb.nodesource.com/setup_16.x | bash -
 apt-get update
-apt-get install -y --no-install-suggests --no-install-recommends clang++-7 clang-7 nodejs git-core g++ libreoffice-writer libreoffice-impress libreoffice-calc unoconv
+apt-get install -y --no-install-suggests --no-install-recommends clang++-9 clang-9 nodejs git-core g++ libreoffice-writer libreoffice-impress libreoffice-calc unoconv
 
-sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-7 100
-sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-7 100
+sudo update-alternatives --install /usr/bin/clang++ clang++ /usr/bin/clang++-9 100
+sudo update-alternatives --install /usr/bin/clang clang /usr/bin/clang-9 100
 
 # Set up libreoffice config directory
 rm -Rf /var/libreoffice

From 1091b7742ceaa70493f785a7945619b219f421f9 Mon Sep 17 00:00:00 2001
From: Stephen Pollard <stephen@stephentpollard.com>
Date: Sun, 24 Jul 2022 20:31:19 -0400
Subject: [PATCH 4/5] Removing extra files from sandstorm-files.list

---
 .sandstorm/sandstorm-files.list | 45 ---------------------------------
 1 file changed, 45 deletions(-)

diff --git a/.sandstorm/sandstorm-files.list b/.sandstorm/sandstorm-files.list
index 6a214f9..d41fb38 100644
--- a/.sandstorm/sandstorm-files.list
+++ b/.sandstorm/sandstorm-files.list
@@ -3,13 +3,6 @@
 # the app runs in dev mode. You may manually add or remove files, but don't
 # expect comments or ordering to be retained.
 bin
-bin/bash
-bin/cp
-bin/dash
-bin/df
-bin/mkdir
-bin/rm
-bin/sh
 etc/alternatives/awk
 etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans-mono.conf
 etc/fonts/conf.avail/20-unhint-small-dejavu-lgc-sans.conf
@@ -61,45 +54,7 @@ etc/mtab
 etc/passwd
 etc/ssl/openssl.cnf
 lib
-lib/x86_64-linux-gnu/libacl.so.1
-lib/x86_64-linux-gnu/libattr.so.1
-lib/x86_64-linux-gnu/libblkid.so.1
-lib/x86_64-linux-gnu/libblkid.so.1.1.0
-lib/x86_64-linux-gnu/libbsd.so.0
-lib/x86_64-linux-gnu/libbz2.so.1.0
-lib/x86_64-linux-gnu/libbz2.so.1.0.4
-lib/x86_64-linux-gnu/libc.so.6
-lib/x86_64-linux-gnu/libcom_err.so.2
-lib/x86_64-linux-gnu/libcom_err.so.2.1
-lib/x86_64-linux-gnu/libdbus-1.so.3
-lib/x86_64-linux-gnu/libdl.so.2
-lib/x86_64-linux-gnu/libexpat.so.1
-lib/x86_64-linux-gnu/libgcc_s.so.1
-lib/x86_64-linux-gnu/libgcrypt.so.20
-lib/x86_64-linux-gnu/libglib-2.0.so.0
-lib/x86_64-linux-gnu/libgpg-error.so.0
-lib/x86_64-linux-gnu/libkeyutils.so.1
-lib/x86_64-linux-gnu/liblzma.so.5
-lib/x86_64-linux-gnu/libm.so.6
-lib/x86_64-linux-gnu/libmount.so.1
-lib/x86_64-linux-gnu/libmount.so.1.1.0
-lib/x86_64-linux-gnu/libnsl.so.1
-lib/x86_64-linux-gnu/libnss_compat.so.2
-lib/x86_64-linux-gnu/libnss_dns.so.2
-lib/x86_64-linux-gnu/libnss_files.so.2
-lib/x86_64-linux-gnu/libpcre.so.3
-lib/x86_64-linux-gnu/libpcre.so.3.13.3
-lib/x86_64-linux-gnu/libpthread.so.0
-lib/x86_64-linux-gnu/libresolv.so.2
-lib/x86_64-linux-gnu/librt.so.1
-lib/x86_64-linux-gnu/libselinux.so.1
-lib/x86_64-linux-gnu/libsystemd.so.0
-lib/x86_64-linux-gnu/libutil.so.1
-lib/x86_64-linux-gnu/libuuid.so.1
-lib/x86_64-linux-gnu/libuuid.so.1.3.0
-lib/x86_64-linux-gnu/libz.so.1
 lib64
-lib64/ld-linux-x86-64.so.2
 opt
 opt/app
 opt/app/.sandstorm/launcher.sh

From cf5a9b5b9fa6e776af5c5e33f883665d8a06ce05 Mon Sep 17 00:00:00 2001
From: Stephen Pollard <stephen@stephentpollard.com>
Date: Sun, 24 Jul 2022 21:24:20 -0400
Subject: [PATCH 5/5] Warn at less unexpected times

---
 app/components/rename-dialog.js | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/components/rename-dialog.js b/app/components/rename-dialog.js
index 945fe96..f8d585f 100644
--- a/app/components/rename-dialog.js
+++ b/app/components/rename-dialog.js
@@ -4,6 +4,7 @@ import { tracked } from '@glimmer/tracking';
 import { inject as service } from '@ember/service';
 
 export default class DeleteDialog extends Component {
+  oldName = ""
   @tracked newName = 'new-file';
   @tracked validationError = null;
   @tracked warning = null;
@@ -25,6 +26,7 @@ export default class DeleteDialog extends Component {
     const selectedPath = this.args.selectedFiles.values().next().value;
     const selectedFile = sortedFiles.find((f) => f.path === selectedPath);
     this.newName = selectedFile.name;
+    this.oldName = selectedFile.name
   }
 
   @action
@@ -36,21 +38,24 @@ export default class DeleteDialog extends Component {
   onChange(event) {
     const { value } = event.target;
 
-    if (!this.nameValidation[0].validate(value)) {
+    if (value != this.oldName && !this.nameValidation[0].validate(value)) {
       this.validationError = this.nameValidation[0].message;
-      return;
     } else {
       this.validationError = null;
       this.newName = value;
     }
-    if (targetExists(value)) {
-      this.warning = "File name already exists. Warning! This will overwrite!";
-      return;
+    if (value && value != this.oldName && this.targetExists(value)) {
+      this.warning = `Warning: File already exists. This will overwrite ${this.newName}!`;
     } else {
       this.warning = null;
     }
   }
 
+  targetExists(name) {
+    const { sortedFiles } = this.args.model;
+    return sortedFiles.find((f) => f.name === this.newName);
+  }
+
   @action
   async rename(event) {
     event.preventDefault();