cosmetic changes

This commit is contained in:
Francois B 2018-03-25 12:47:40 +02:00
parent e979679660
commit 39fab2feb0
3 changed files with 30 additions and 16 deletions

View file

@ -383,8 +383,8 @@ function addSpecificRepoFct () {
for i in $AppsRepo; do for i in $AppsRepo; do
appRepo=(${i//;/ }) appRepo=(${i//;/ })
if [ "${appRepo[0]}" == "$1" ]; then if [ "${appRepo[0]}" == "$1" ]; then
printf "[ADD_REPO] for package : $1, " printf "[ADD] package -- $1 -- repo/ppa "
printf "add repo by function : ${appRepo[1]} \n" printf "added by function -- ${appRepo[1]} --\n"
eval "${appRepo[1]}" eval "${appRepo[1]}"
repoAdded=$(($repoAdded+1)) repoAdded=$(($repoAdded+1))
fi fi
@ -404,8 +404,8 @@ function processAppTrtFct () {
for i in $AppsTrtFct; do for i in $AppsTrtFct; do
appTrtFct=(${i//;/ }) appTrtFct=(${i//;/ })
if [ "${appTrtFct[0]}" == "$1" ]; then if [ "${appTrtFct[0]}" == "$1" ]; then
printf "[TRT_FCT] for package : $1, " printf "[TRT] package -- $1 -- "
printf "processing function : ${appTrtFct[1]} \n" printf "post install processed by -- ${appTrtFct[1]} --"
eval "${appTrtFct[1]}" eval "${appTrtFct[1]}"
fi fi
done done

View file

@ -785,8 +785,6 @@ function nitrogen_TrtFct () {
# install required ppa and settings # install required ppa and settings
# #
function addRequiredPPA () { function addRequiredPPA () {
msg "Adding PPA and repositories"
runCmd "sudo dpkg --add-architecture i386" \ runCmd "sudo dpkg --add-architecture i386" \
"adding i386 architecture" "adding i386 architecture"
@ -795,6 +793,9 @@ function addRequiredPPA () {
runCmd "echo sience-config science-config/group select '$myHomedir ($myHomedir)' | sudo debconf-set-selections" \ runCmd "echo sience-config science-config/group select '$myHomedir ($myHomedir)' | sudo debconf-set-selections" \
"apply settings for science-config pkg" "apply settings for science-config pkg"
runCmd "echo oracle-java9-installer shared/accepted-oracle-license-v1-1 select true | sudo /usr/bin/debconf-set-selections" \
"Accepting Oracle Java SE 9"
addPPA "noobslab/themes" # themes from noobslab addPPA "noobslab/themes" # themes from noobslab
addPPA "noobslab/icons" # icons from noobslab addPPA "noobslab/icons" # icons from noobslab
addPPA "numix/ppa" # theme Numix addPPA "numix/ppa" # theme Numix

View file

@ -67,31 +67,37 @@ while getopts ":h,v,f,c,t,u,a,d,k,s,t,n" option; do
# tlp, KeyID # tlp, KeyID
# dev apps : all # dev apps : all
# customization : themes, icons # customization : themes, icons
msg "Initializing"
yggInit yggInit
msg "Updating the system"
updateSystem updateSystem
msg "Adding required repo/ppa"
addRequiredPPA addRequiredPPA
msg "Installing Apps"
installBase installBase
installOffice installOffice
installBurningTools installBurningTools
installCajaPlugins
installNautilusAndPlugins
installEbook installEbook
installGames installGames
installGimpPlugins
installInternet installInternet
installJava9 installJava9
installMiscUtilities installMiscUtilities
installMultimedia installMultimedia
installNetTools installNetTools
installOffice installOffice
installPidginPlugins
installRhythmBoxPlugins
installWine installWine
installViber installViber
installFranz installFranz
installTeamViewer13 installTeamViewer13
installCajaPlugins
installNautilusAndPlugins
installGimpPlugins
installPidginPlugins
installRhythmBoxPlugins
msg "Installing HW related"
installWebcam installWebcam
updateMicrocode updateMicrocode
msg "Applying system customizations"
enableUFW enableUFW
enableNumLockX enableNumLockX
addScreenfetchBashrc addScreenfetchBashrc
@ -106,36 +112,43 @@ while getopts ":h,v,f,c,t,u,a,d,k,s,t,n" option; do
# tlp, KeyID # tlp, KeyID
# tweak : /tmp in ram # tweak : /tmp in ram
#TODO: dev apps #TODO: dev apps
msg "Initializing"
yggInit yggInit
msg "Updating the system"
updateSystem updateSystem
msg "Adding required repo/ppa"
addRequiredPPA addRequiredPPA
msg "Installing Apps"
installBase installBase
installOffice installOffice
installBurningTools installBurningTools
installCajaPlugins
installNautilusAndPlugins
installEbook installEbook
installGames installGames
installGimpPlugins
installInternet installInternet
installJava9 installJava9
installMiscUtilities installMiscUtilities
installMultimedia installMultimedia
installNetTools installNetTools
installOffice installOffice
installPidginPlugins
installRhythmBoxPlugins
installWine installWine
installViber installViber
installFranz installFranz
installTeamViewer13 installTeamViewer13
installCajaPlugins
installNautilusAndPlugins
installGimpPlugins
installPidginPlugins
installRhythmBoxPlugins
msg "Installing HW related"
installWebcam installWebcam
updateMicrocode updateMicrocode
msg "Applying system customizations"
enableUFW enableUFW
enableNumLockX enableNumLockX
addScreenfetchBashrc addScreenfetchBashrc
enableHistoryTS enableHistoryTS
installUnattendedUpgrades installUnattendedUpgrades
msg "Installing additional themes/icons"
installIcons installIcons
installThemes installThemes
exit exit