fixed indentation
This commit is contained in:
@@ -20,28 +20,28 @@ install_pkg()
|
||||
{
|
||||
# Remove unnecessary packages
|
||||
if [[ -n $PKGS_RMLIST ]]; then
|
||||
prnt I "Removing some undesired packages..."
|
||||
pkgrm $PKGS_RMLIST
|
||||
prnt I "Removing some undesired packages..."
|
||||
pkgrm $PKGS_RMLIST
|
||||
fi
|
||||
|
||||
# Blacklist some anoying packages (and remove them if needed)
|
||||
if [[ -n PKGS_BLACKLIST ]]; then
|
||||
for pkg in $PKGS_BLACKLIST; do
|
||||
prnt I "Placing $pkg into the blacklist..."
|
||||
local dest=/etc/apt/preferences.d/blacklist_$pkg
|
||||
install_file pkgman/blacklist.conf $dest &&
|
||||
sed -i -e "s/@pkg@/pkg/" $dest
|
||||
tag_file $dest
|
||||
for pkg in $PKGS_BLACKLIST; do
|
||||
prnt I "Placing $pkg into the blacklist..."
|
||||
local dest=/etc/apt/preferences.d/blacklist_$pkg
|
||||
install_file pkgman/blacklist.conf $dest &&
|
||||
sed -i -e "s/@pkg@/pkg/" $dest
|
||||
tag_file $dest
|
||||
|
||||
# If blacklisted we suppose uninstall as well (if neeeded)
|
||||
pkgrm $pkg
|
||||
done
|
||||
# If blacklisted we suppose uninstall as well (if neeeded)
|
||||
pkgrm $pkg
|
||||
done
|
||||
fi
|
||||
|
||||
# Install all the configured packages
|
||||
if [[ -n $PKGSEL ]]; then
|
||||
prnt I "Installing the package selection..."
|
||||
pkginst $PKGSEL
|
||||
prnt I "Installing the package selection..."
|
||||
pkginst $PKGSEL
|
||||
fi
|
||||
|
||||
# Cleaning
|
||||
@@ -52,22 +52,22 @@ install_pkg()
|
||||
precheck_install_pkg()
|
||||
{
|
||||
if [[ -z PKGS_RMLIST ]]; then
|
||||
prnt m " * No package to remove."
|
||||
prnt m " * No package to remove."
|
||||
else
|
||||
prnt m " * $(echo $PKGS_RMLIST | wc -w) package to remove."
|
||||
prnt m " * $(echo $PKGS_RMLIST | wc -w) package to remove."
|
||||
fi
|
||||
|
||||
if [[ -z PKGS_BLACKLIST ]]; then
|
||||
prnt m " * The packages $pkg will be placed into the blacklist !"
|
||||
file_must_exists pkgman/blacklist.conf
|
||||
prnt m " * The packages $pkg will be placed into the blacklist !"
|
||||
file_must_exists pkgman/blacklist.conf
|
||||
else
|
||||
prnt m " * No package to blacklist."
|
||||
prnt m " * No package to blacklist."
|
||||
fi
|
||||
|
||||
if [[ -z $PKGSEL ]]; then
|
||||
prnt m " * No additionnal package to install !"
|
||||
prnt m " * No additionnal package to install !"
|
||||
else
|
||||
prnt m " * $(echo $PKGSEL | wc -w) additionnal package have to be installed."
|
||||
prnt m " * $(echo $PKGSEL | wc -w) additionnal package have to be installed."
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user