diff --git a/basic-checks.sh b/basic-checks.sh index 27ef69f..4bedf29 100644 --- a/basic-checks.sh +++ b/basic-checks.sh @@ -1,4 +1,7 @@ #!/bin/bash +# Author: TheElectronWill +# Made for https://github.com/RPM-Outpost +# This script requires terminal-colors.sh and common-functions.sh # It's a bad idea to run rpmbuild as root! if [ "$(id -u)" = "0" ]; then @@ -24,7 +27,7 @@ if ! type 'rpmbuild' > /dev/null; then echo case "$answer" in y|Y) - sudo -p 'Enter your password to install rpmdevtools: ' dnf install rpmdevtools + sudo_install_prompt 'Enter your password to install rpmdevtools: ' rpmdevtools ;; *) echo "${reset}The package won't be installed. Exiting now." diff --git a/common-functions.sh b/common-functions.sh index f10e028..3a50cc2 100644 --- a/common-functions.sh +++ b/common-functions.sh @@ -1,4 +1,26 @@ #!/bin/bash +# Author: TheElectronWill +# Various functions used by the scripts of https://github.com/RPM-Outpost +# This script requires terminal-colors.sh + +# Initializes $installer and $distrib +if hash dnf 2>/dev/null; then + # Fedora, CentOS + installer="dnf install" + distrib="redhat" +elif hash zypper 2>/dev/null; then + # OpenSUSE + installer="zypper install" + distrib="suse" +elif hash urpmi 2>/dev/null; then + # Mageia + installer="urpmi" + distrib="mageia" +else + # Unknown + installer="exit" + distrib="unknown" +fi # ask_yesno question ## Asks a yes/no question and stores the result in the 'answer' variable @@ -35,7 +57,7 @@ manage_dir() { mkdir -p "$1" } -# ask_installpkg +# ask_installpkg [all] [allowerasing] ## Asks the user if they want to install the newly created package. ask_installpkg() { if [[ $1 == "all" || $2 == "all" ]]; then @@ -63,7 +85,25 @@ ask_installpkg() { esac } -# extract archive_file destination [options] +# sudo_install pkg [options] +sudo_install() { + if [[ $# -eq 1 ]]; then + sudo $installer "$1" + else + sudo $installer "$1" $2 + fi +} + +# sudo_install_prompt prompt pkg [options] +sudo_install_prompt() { + if [[ $# -eq 2 ]]; then + sudo -p "$1" $installer "$2" + else + sudo -p "$1" $installer "$2" $3 + fi +} + +# extract archive_file destination [option1 [option2]] extract() { echo "Extracting \"$1\"..." if [[ "$1" == *.tar.gz ]]; then diff --git a/terminal-colors.sh b/terminal-colors.sh index 51ac5ac..2a24532 100644 --- a/terminal-colors.sh +++ b/terminal-colors.sh @@ -1,4 +1,6 @@ #!/bin/bash +# Author: TheElectronWill +# Script to use terminal colors easily, made for https://github.com/RPM-Outpost # Colors IDs id_black=0