From 53ee8c6bb7e4dad7d406ae90e2d79dd49f9c6d77 Mon Sep 17 00:00:00 2001 From: Anthony Perkins Date: Fri, 22 Mar 2024 15:59:10 +0000 Subject: [PATCH] Use uname for inventories --- console.sh | 11 +---------- desktop.sh | 11 +---------- inventories/{freebsd.ini => FreeBSD.ini} | 0 local.ini => inventories/Linux.ini | 0 inventories/{netbsd.ini => NetBSD.ini} | 0 inventories/{openbsd.ini => OpenBSD.ini} | 0 6 files changed, 2 insertions(+), 20 deletions(-) rename inventories/{freebsd.ini => FreeBSD.ini} (100%) rename local.ini => inventories/Linux.ini (100%) rename inventories/{netbsd.ini => NetBSD.ini} (100%) rename inventories/{openbsd.ini => OpenBSD.ini} (100%) diff --git a/console.sh b/console.sh index d6f00a6..6b8375f 100755 --- a/console.sh +++ b/console.sh @@ -1,12 +1,3 @@ #!/bin/sh . ./roles/home-cli/files/profile -if [ $(uname -s) = FreeBSD ] -then - INVENTORY=./inventories/freebsd.ini -elif [ $(uname -s) = OpenBSD ] -then - INVENTORY=./inventories/openbsd.ini -else - INVENTORY=./local.ini -fi -./user-cli.yml -i $INVENTORY +./user-cli.yml -i ./inventories/$(uname -s).ini diff --git a/desktop.sh b/desktop.sh index e242bf3..54c8e69 100755 --- a/desktop.sh +++ b/desktop.sh @@ -1,12 +1,3 @@ #!/bin/sh . ./roles/home-cli/files/profile -if [ $(uname -s) = FreeBSD ] -then - INVENTORY=./inventories/freebsd.ini -elif [ $(uname -s) = OpenBSD ] -then - INVENTORY=./inventories/openbsd.ini -else - INVENTORY=./local.ini -fi -./user-gui.yml -i $INVENTORY +./user-gui.yml -i ./inventories/$(uname -s).ini diff --git a/inventories/freebsd.ini b/inventories/FreeBSD.ini similarity index 100% rename from inventories/freebsd.ini rename to inventories/FreeBSD.ini diff --git a/local.ini b/inventories/Linux.ini similarity index 100% rename from local.ini rename to inventories/Linux.ini diff --git a/inventories/netbsd.ini b/inventories/NetBSD.ini similarity index 100% rename from inventories/netbsd.ini rename to inventories/NetBSD.ini diff --git a/inventories/openbsd.ini b/inventories/OpenBSD.ini similarity index 100% rename from inventories/openbsd.ini rename to inventories/OpenBSD.ini