Merge branch 'package-install'

bin/install.sh

@@ -0,0 +1,5 @@
+#!/bin/bash
+
+cp -rv .local $HOME/
+sed -i "s|libMangoHud.so|$HOME/.local/share/MangoHud/libMangoHud32.so|g" $HOME/.local/share/vulkan/implicit_layer.d/mangohud32.json
+sed -i "s|libMangoHud.so|$HOME/.local/share/MangoHud/libMangoHud.so|g" $HOME/.local/share/vulkan/implicit_layer.d/mangohud64.json

build.sh

@@ -2,8 +2,10 @@
 
 DATA_DIR=$HOME/.local/share/MangoHud
 LAYER=build/release/usr/share/vulkan/implicit_layer.d/mangohud.json
+INSTALL_DIR=build/package/MangoHud/.local/share
 IMPLICIT_LAYER_DIR=$HOME/.local/share/vulkan/implicit_layer.d 
 DISTRO=$(sed 1q /etc/os-release | sed 's/NAME=//g' | sed 's/"//g')
+VERSION=$(printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
 
 dependencies() {
     if [[ ! -f build/release/usr/lib64/libMangoHud.so ]]; then
@@ -31,18 +33,17 @@ dependencies() {
                 MANAGER_INSTALL="pacman -S"
                 DEPS="{gcc,meson,pkgconf,python-mako,glslang,libglvnd,lib32-libglvnd}"
                 install
-                ;;
+            ;;
             "Fedora")
                 MANAGER_QUERY="dnf list installed"
                 MANAGER_INSTALL="dnf install"
                 DEPS="{meson,gcc,g++,libX11-devel,glslang,python-mako,mesa-libGL-devel}"
                 install
 
-                unset DEPS
                 unset INSTALL
                 DEPS="{glibc-devel.i686,libstdc++-devel.i686,libX11-devel.i686}"
                 install
-                ;;
+            ;;
             "Ubuntu"|"Linux Mint"|"Debian")
                 MANAGER_QUERY="dpkg-query -l"
                 MANAGER_INSTALL="apt install"
@@ -58,7 +59,7 @@ dependencies() {
                     sudo install -m755 bin/glslangValidator /usr/local/bin/
                     rm bin/glslangValidator glslang-master-linux-Release.zip
                 fi
-                ;;
+            ;;
             *)
                 echo "# Unable to find distro information!"
                 echo "# Attempting to build regardless"
@@ -81,28 +82,35 @@ configure() {
 }
 
 build() {
+    if [[ ! -d build/meson64 ]]; then
+        configure
+    fi
     ninja -C build/meson32 install
     ninja -C build/meson64 install
 }
 
-install() {
-    mkdir -p $IMPLICIT_LAYER_DIR
-    mkdir -p $DATA_DIR
+package() {
+    if [[ ! -f build/release/usr/lib64/libMangoHud.so ]]; then
+        build
+    fi
+    mkdir -p $INSTALL_DIR/{MangoHud,vulkan/implicit_layer.d}
 
-    cp build/release/usr/lib32/libMangoHud.so $DATA_DIR/libMangoHud32.so
-    cp build/release/usr/lib64/libMangoHud.so $DATA_DIR/libMangoHud.so
-    cp $LAYER $IMPLICIT_LAYER_DIR/mangohud64.json
-    cp $LAYER $IMPLICIT_LAYER_DIR/mangohud32.json
+    cp build/release/usr/lib32/libMangoHud.so $INSTALL_DIR/MangoHud/libMangoHud32.so
+    cp build/release/usr/lib64/libMangoHud.so $INSTALL_DIR/MangoHud/libMangoHud.so
+    cp $LAYER $INSTALL_DIR/vulkan/implicit_layer.d/mangohud64.json
+    cp $LAYER $INSTALL_DIR/vulkan/implicit_layer.d/mangohud32.json
+    cp --preserve=mode bin/install.sh build/package/MangoHud/install.sh
+    sed -i "s|64bit|32bit|g" $INSTALL_DIR/vulkan/implicit_layer.d/mangohud32.json
 
-    sed -i "s|libMangoHud.so|$HOME/.local/share/MangoHud/libMangoHud32.so|g" $IMPLICIT_LAYER_DIR/mangohud32.json
-    sed -i "s|libMangoHud.so|$HOME/.local/share/MangoHud/libMangoHud.so|g" $IMPLICIT_LAYER_DIR/mangohud64.json
-    sed -i "s|64bit|32bit|g" $IMPLICIT_LAYER_DIR/mangohud32.json
+    cd build/package
+    tar cpzf ../MangoHud-$VERSION.tar.gz .
+    cd ../../
 }
 
-package() {
-    VERSION=$(printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)")
-    cd build/release
-    tar czf ../../MangoHud-$VERSION.tar.gz *
+install() {
+    tar xzf build/MangoHud-$VERSION.tar.gz --exclude='install.sh' --strip-components=2 -C $HOME/
+    sed -i "s|libMangoHud.so|$HOME/.local/share/MangoHud/libMangoHud32.so|g" $HOME/.local/share/vulkan/implicit_layer.d/mangohud32.json
+    sed -i "s|libMangoHud.so|$HOME/.local/share/MangoHud/libMangoHud.so|g" $HOME/.local/share/vulkan/implicit_layer.d/mangohud64.json
 }
 
 clean() {
@@ -114,15 +122,18 @@ uninstall() {
     rm $IMPLICIT_LAYER_DIR/{mangohud64,mangohud32}.json
 }
 
-case $1 in
-    "") configure; build;;
-    "build") configure; build;;
-    "install") configure; build; install;;
-    "update") git pull &> /dev/null; configure; build; install;;
-    "package") package;;
-    "clean") clean;;
-    "uninstall") uninstall;;
-    *)
-        echo "Unrecognized command argument: $1"
-        echo 'Accepted arguments: "", "build", "install", "update", "package", "clean", "uninstall".'
-esac
+for a in $@; do
+    case $a in
+        "") configure; build;;
+        "pull") git pull;;
+        "configure") configure;;
+        "build") configure; build;;
+        "package") package;;
+        "install") package; install;;
+        "clean") clean;;
+        "uninstall") uninstall;;
+        *)
+            echo "Unrecognized command argument: $a"
+            echo 'Accepted arguments: "pull", "configure", "build", "package", "install", "clean", "uninstall".'
+    esac
+done