re-added extra installs logic
This commit is contained in:
parent
56ed1943ca
commit
5b60075290
1 changed files with 9 additions and 11 deletions
20
install.sh
20
install.sh
|
|
@ -116,7 +116,6 @@ script-title(){
|
||||||
# Function for displaying the usage of this script
|
# Function for displaying the usage of this script
|
||||||
usage(){
|
usage(){
|
||||||
boxborder \
|
boxborder \
|
||||||
"${lyl}$scripttitle${dfl}" \
|
|
||||||
"${lbl}Usage:${dfl}" \
|
"${lbl}Usage:${dfl}" \
|
||||||
"${lyl}./$scriptname ${bld}[args]${dfl}" \
|
"${lyl}./$scriptname ${bld}[args]${dfl}" \
|
||||||
"$(boxseparator)" \
|
"$(boxseparator)" \
|
||||||
|
|
@ -400,8 +399,10 @@ userinstall(){
|
||||||
#clear
|
#clear
|
||||||
|
|
||||||
# Download and install any other extras
|
# Download and install any other extras
|
||||||
if [ -f "${rundir_absolute}/extra.installs" ] ; then
|
if [ -f "${rundir_absolute}/extras/*.install" ] ; then
|
||||||
/bin/bash ${rundir_absolute}/extra.installs
|
for file in ${rundir_absolute}/extras/*.install ; do
|
||||||
|
run /bin/bash "${rundir_absolute}/extras/$file"
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
if [[ $dry_run != true ]] ; then
|
if [[ $dry_run != true ]] ; then
|
||||||
boxborder "${grn}Please be sure to run ${lyl}sensors-detect --auto${grn} after installation completes${dfl}"
|
boxborder "${grn}Please be sure to run ${lyl}sensors-detect --auto${grn} after installation completes${dfl}"
|
||||||
|
|
@ -471,8 +472,10 @@ globalinstall(){
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Download and install any other extras
|
# Download and install any other extras
|
||||||
if [ -f "${rundir_absolute}/extra.installs" ] ; then
|
if [ -f "${rundir_absolute}/extras/*.install" ] ; then
|
||||||
/bin/bash ${rundir_absolute}/extra.installs
|
for file in ${rundir_absolute}/extras/*.install ; do
|
||||||
|
run /bin/bash "${rundir_absolute}/extras/$file"
|
||||||
|
done
|
||||||
fi
|
fi
|
||||||
#clear
|
#clear
|
||||||
}
|
}
|
||||||
|
|
@ -540,15 +543,10 @@ dry-run-report(){
|
||||||
"${installed_dirs[@]}"
|
"${installed_dirs[@]}"
|
||||||
}
|
}
|
||||||
|
|
||||||
script-title(){
|
|
||||||
boxborder \
|
|
||||||
"$(center ${lyl}$scriptname${dfl})"
|
|
||||||
}
|
|
||||||
|
|
||||||
#------------------------------------------------------#
|
#------------------------------------------------------#
|
||||||
# Options and Arguments Parser
|
# Options and Arguments Parser
|
||||||
#------------------------------------------------------#
|
#------------------------------------------------------#
|
||||||
|
script-title
|
||||||
case $1 in
|
case $1 in
|
||||||
-i | --install)
|
-i | --install)
|
||||||
install && success " [${red}P${lrd}R${ylw}b${ong}L ${lyl}Installed${dfl}]"
|
install && success " [${red}P${lrd}R${ylw}b${ong}L ${lyl}Installed${dfl}]"
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue