From 34607996233a82fbb0ec084686ba5579e4e33440 Mon Sep 17 00:00:00 2001 From: Josh Ashton Date: Mon, 12 Feb 2024 18:13:02 -0700 Subject: [PATCH] added git support to check dependencies --- calculator | 1 + check-dependency | 27 +++++++++++++++++---------- inst | 2 +- 3 files changed, 19 insertions(+), 11 deletions(-) create mode 160000 calculator diff --git a/calculator b/calculator new file mode 160000 index 0000000..8b9116b --- /dev/null +++ b/calculator @@ -0,0 +1 @@ +Subproject commit 8b9116bcd140f36441e1c6625784d0c9dc6c9251 diff --git a/check-dependency b/check-dependency index 1cf0100..eef09f7 100755 --- a/check-dependency +++ b/check-dependency @@ -19,22 +19,22 @@ install() { DISTRO=$(cat /etc/os-release | grep -oP '(?<=^ID=).+' | tr -d '"') if [[ $DISTRO == "arch" ]]; then - sudo pacman -S $PACKAGE + yes | sudo pacman -S $PACKAGE exit 0 elif [[ $DISTRO == "archarm" ]]; then - sudo pacman -S $PACKAGE + yes | sudo pacman -S $PACKAGE exit 0 elif [[ $DISTRO == "ubuntu" ]]; then - sudo apt-get install $PACKAGE + yes | sudo apt-get install $PACKAGE exit 0 elif [[ $DISTRO == "fedora" ]]; then - sudo dnf install $PACKAGE + yes | sudo dnf install $PACKAGE exit 0 elif [[ $DISTRO == "centos" ]]; then - sudo yum install $PACKAGE + yes | sudo yum install $PACKAGE exit 0 elif [[ $DISTRO == "debian" ]]; then - sudo apt install $PACKAGE + yes | sudo apt install $PACKAGE exit 0 else error @@ -45,11 +45,11 @@ install() { if command -v "brew" &> /dev/null then - brew install $PACKAGE + yes | brew install $PACKAGE elif command -v "port" &> /dev/null then - sudo port install $PACKAGE + yes | sudo port install $PACKAGE else echo "Homebrew or MacPorts not found. Please install one of them before running this script." @@ -77,14 +77,21 @@ COMMAND=$1 PACKAGE=$2 # If the command is git, we will clone the repository and install it -if $COMMAND == "--git"; then +if [[ "$COMMAND" == "--git" ]]; then USER=$(echo $PACKAGE | cut -d'/' -f1) REPO=$(echo $PACKAGE | cut -d'/' -f2) # If the repository is not installed, we will clone it and install it if ! command -v $REPO &> /dev/null then - cd /tmp + THIS_USER=$SUDO_USER + + if [ ! -d /home/$THIS_USER/build ]; then + echo "Creating build directory for user $THIS_USER..." + su $THIS_USER -c "mkdir /home/$THIS_USER/build" + fi + + cd /home/$THIS_USER/build git clone https://github.com/$USER/$REPO cd $REPO inst diff --git a/inst b/inst index 91735f2..0904785 100755 --- a/inst +++ b/inst @@ -23,7 +23,7 @@ save_desktop_entry() { sudo echo "Name=$NAME" >> /usr/share/applications/$NAME.desktop sudo echo "Exec=$EXECUTABLE" >> /usr/share/applications/$NAME.desktop sudo echo "Type=Application" >> /usr/share/applications/$NAME.desktop - sudo echo "\n# Auto-generated by the install script" >> /usr/share/applications/$NAME.desktop + sudo echo "# Auto-generated by the install script" >> /usr/share/applications/$NAME.desktop else echo "This operating system is not yet supported." exit 1