From e00167d3b90b109cf96259d74049c184249f15dc Mon Sep 17 00:00:00 2001
From: Vladislav Nepogodin <nepogodin.vlad@gmail.com>
Date: Fri, 28 Jan 2022 03:19:24 +0400
Subject: [PATCH] =?UTF-8?q?=E2=99=BB=20=20update=20fmtlib?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .gitignore           |   1 +
 CMakeLists.txt       |   2 +-
 configure.sh         |  98 +++++++++++++++++++++++++++++++++++++++++
 subprojects/fmt.wrap |   2 +-
 toolbox.sh           | 102 -------------------------------------------
 5 files changed, 101 insertions(+), 104 deletions(-)
 create mode 100755 configure.sh
 delete mode 100755 toolbox.sh

diff --git a/.gitignore b/.gitignore
index bcf582b..0955ed1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,6 +3,7 @@
 *.ctu-info
 .cache
 .idea
+build.sh
 build
 cmake-build-release
 cmake-build-debug
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9c80a1c..86ac167 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -41,7 +41,7 @@ FetchContent_Declare(ftxui
 )
 FetchContent_Declare(fmt
   GIT_REPOSITORY "https://github.com/fmtlib/fmt.git"
-  GIT_TAG "c06bef7273e594bfa91739e29d339fba51fd4e0e"
+  GIT_TAG "a7aecbfcaa0e1586da9cf8175bd8d1c4383acd8c"
 )
 FetchContent_MakeAvailable(fmt)
 FetchContent_Declare(spdlog
diff --git a/configure.sh b/configure.sh
new file mode 100755
index 0000000..21a7d93
--- /dev/null
+++ b/configure.sh
@@ -0,0 +1,98 @@
+#!/bin/bash
+# Copyright (C) 2022 Vladislav Nepogodin
+#
+# This file is part of CachyOS CLI.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+set -e
+
+cd "`dirname "$0"`"
+
+if [[ $1 == "--help" ]]; then
+cat<<EOF
+Usage: configure.sh [options]
+Options:
+  --help                   Display this information.
+  --buildtype=, -t=        Specify build type.
+  --prefix=                Specify install prefix.
+  --libdir=                Specify lib directory.
+  --path=, -p=             Specify build directory.
+EOF
+exit 0
+fi
+
+
+_buildpath="build"
+_prefix="/usr/local"
+_libdir="lib"
+_buildtype="RelWithDebInfo"
+for i in "$@"; do
+  case $i in
+    -t=*|--buildtype=*)
+      _buildtype="${i#*=}"
+      shift # past argument=value
+      ;;
+    --prefix=*)
+      _prefix="${i#*=}"
+      shift # past argument=value
+      ;;
+    --libdir=*)
+      _libdir="${i#*=}"
+      shift # past argument=value
+      ;;
+    -p=*|--path=*)
+      _buildpath="${i#*=}"
+      shift # past argument=value
+      ;;
+    *)
+      # unknown option
+      ;;
+  esac
+done
+
+cmake -S . -B ${_buildpath}/${_buildtype} \
+    -DCMAKE_BUILD_TYPE=${_buildtype} \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_INSTALL_LIBDIR=${_libdir}
+
+cat > build.sh <<EOF
+#!/bin/bash
+# Copyright (C) 2022 Vladislav Nepogodin
+#
+# This file is part of CachyOS CLI.
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License along
+# with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+
+set -e
+
+cd "\`dirname "\$0"\`"
+
+cmake --build ${_buildpath}/${_buildtype} --parallel $(nproc)
+EOF
+
+chmod +x ./build.sh
diff --git a/subprojects/fmt.wrap b/subprojects/fmt.wrap
index 644ec03..5d15ef9 100644
--- a/subprojects/fmt.wrap
+++ b/subprojects/fmt.wrap
@@ -1,6 +1,6 @@
 [wrap-git]
 url = https://github.com/fmtlib/fmt.git
-revision = c06bef7273e594bfa91739e29d339fba51fd4e0e
+revision = a7aecbfcaa0e1586da9cf8175bd8d1c4383acd8c
 
 patch_directory = fmt
 
diff --git a/toolbox.sh b/toolbox.sh
deleted file mode 100755
index dcffdc4..0000000
--- a/toolbox.sh
+++ /dev/null
@@ -1,102 +0,0 @@
-#!/bin/bash
-clear
-
-binName="cachyos-installer"
-
-if [[ $EUID -eq 0 ]]; then
-	echoRed "You cannot run this as root."
-	exit 1
-fi
-
-function run() {
-	sudo $binName
-}
-
-function build() {
-	echoGreen "Building CachyOS Installer..."
-
-	if [[ ! -d "cmake-build-release" ]]; then
-		mkdir -p cmake-build-release
-	fi
-
-	cd cmake-build-release || return
-	cmake -D CMAKE_BUILD_TYPE=Release ..
-	make -j "$(nproc --all)"
-	sudo cp -rf $binName /usr/bin/$binName
-	cd ..
-}
-
-function buildDebug() {
-	echoOrange "Building CachyOS Installer in debug..."
-
-	if [[ ! -d "cmake-build-debug" ]]; then
-		mkdir -p cmake-build-debug
-	fi
-
-	cd cmake-build-debug || return
-	cmake -D CMAKE_BUILD_TYPE=Debug ..
-	make -j "$(nproc --all)"
-	sudo cp -rf $binName /usr/bin/$binName
-	cd ..
-}
-
-function pull() {
-	git pull
-}
-
-function echoOrange() {
-	echo -e "\\e[33m$*\\e[0m"
-}
-
-function echoRed() {
-	echo -e "\\e[31m$*\\e[0m"
-}
-
-function echoGreen() {
-	echo -e "\\e[32m$*\\e[0m"
-}
-
-while [[ $# -gt 0 ]]; do
-	keys="$1"
-	case $keys in
-	-r | --run)
-		run
-		shift
-		;;
-	-b | --build)
-		build
-		shift
-		;;
-	-bd | --build_debug)
-		buildDebug
-		shift
-		;;
-	-p | --pull)
-		pull
-		shift
-		;;
-	-h | --help)
-		echo "
-Toolbox script for CachyOS-Installer
-=============================================================================================
-| Argument             | Description                                                        |
-| -------------------- | -------------------------------------------------------------------|
-| -r (--run)           | Run the built binary.                                              |
-| -b (--build)         | Build and install.                                                 |
-| -bd (--build_debug)  | Build and install as debug.                                        |
-| -p (--pull)          | Update from repo.                                                  |
-| -h (--help)          | Show help.                                                         |
-=============================================================================================
-
-All args are executed in the order they are written in, for
-example, \"-p -b -r\" would update the software, then build it, and
-then run it.
-"
-		exit
-		;;
-	*)
-		echo "Unknown arg $1, use -h for help"
-		exit
-		;;
-	esac
-done