From 8ca6190b34a31199ba149692e010516e9906f789 Mon Sep 17 00:00:00 2001
From: Jason <jason@casjay.net>
Date: Thu, 8 Apr 2021 18:09:18 -0400
Subject: [PATCH] =?UTF-8?q?=F0=9F=A6=88=F0=9F=8F=A0=E2=9D=97=20Well=20I=20?=
 =?UTF-8?q?did=20things=20-=20Hopefully=20nothing=20breaks=20=E2=9D=97?=
 =?UTF-8?q?=F0=9F=8F=A0=F0=9F=A6=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 install.sh  | 28 +++++++++++++++++++---------
 version.txt |  2 +-
 2 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/install.sh b/install.sh
index c1c8ff8..3edaceb 100755
--- a/install.sh
+++ b/install.sh
@@ -43,19 +43,25 @@ scripts_check
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Defaults
 APPNAME="${APPNAME:-MesloLGSNF}"
-APPDIR="${APPDIR:-$SHARE/CasjaysDev/fontmgr/$APPNAME}"
-INSTDIR="${APPDIR}"
-REPO="${FONTMGRREPO:-https://github.com/fontmgr/$APPNAME}"
-REPORAW="${REPORAW:-$REPO/raw}"
-APPVERSION="$(__appversion "$REPORAW/master/version.txt")"
+APPDIR="$SHARE/CasjaysDev/fontmgr/$APPNAME"
+INSTDIR="$SHARE/CasjaysDev/fontmgr/$APPNAME"
+REPO_BRANCH="${GIT_REPO_BRANCH:-master}"
+REPO="${FONTMGRREPO:-https://github.com/fontmgr}/$APPNAME"
+REPORAW="$REPO/raw/$REPO_BRANCH"
+APPVERSION="$(__appversion "$REPORAW/version.txt")"
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# Require a version higher than
+fontmgr_req_version "$APPVERSION"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Call the fontmgr function
 fontmgr_install
-fontmgr_run_init
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Script options IE: --help
 show_optvars "$@"
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# initialize the installer
+fontmgr_run_init
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
 # Ensure directories exist
 ensure_dirs
 ensure_perms
@@ -65,7 +71,7 @@ if __am_i_online; then
   if [ -d "$INSTDIR/.git" ]; then
     execute "git_update $INSTDIR" "Updating $APPNAME font package"
   else
-    execute "git_clone $REPO/$APPNAME $INSTDIR" "Installing $APPNAME font package"
+    execute "git_clone $REPO $INSTDIR" "Installing $APPNAME font package"
   fi
   # exit on fail
   failexitcode $? "Git has failed"
@@ -81,6 +87,10 @@ execute "run_postinst" "Running post install scripts"
 # create version file
 fontmgr_install_version
 # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
-# exit
+# run exit function
 run_exit
-# end
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# End application
+# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+# lets exit with code
+exit ${exitCode:-$?}
diff --git a/version.txt b/version.txt
index 2df36e8..6287828 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-031220211545-git
+202104081809-git