bunch of bugs fixed
This commit is contained in:
parent
943a9bbe83
commit
abebc5f64d
5 changed files with 19 additions and 18 deletions
|
@ -175,6 +175,8 @@ function yggInit () {
|
||||||
else
|
else
|
||||||
printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
|
printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n"
|
||||||
printf "[INIT]"
|
printf "[INIT]"
|
||||||
|
installPackage apt "python3-distutils"
|
||||||
|
printf "[INIT]"
|
||||||
installPackage pip "pip"
|
installPackage pip "pip"
|
||||||
printf "[INIT]"
|
printf "[INIT]"
|
||||||
installPackage pip "setuptools"
|
installPackage pip "setuptools"
|
||||||
|
@ -280,17 +282,21 @@ function addKey () {
|
||||||
#
|
#
|
||||||
function addRepo () {
|
function addRepo () {
|
||||||
typeset ret_code
|
typeset ret_code
|
||||||
printf "[REPO] adding : $2 in $1 "
|
if [ ! -f /etc/apt/sources.list.d/$1 ]; then
|
||||||
printf "\n[REPO] adding $2 in $1\n" &>> $logFile
|
printf "[REPO] adding : $2 in $1 "
|
||||||
echo $2 | sudo tee /etc/apt/sources.list.d/$1 &>> $logFile
|
printf "\n[REPO] adding $2 in $1\n" &>> $logFile
|
||||||
ret_code=$?
|
echo $2 | sudo tee /etc/apt/sources.list.d/$1 &>> $logFile
|
||||||
retCode $ret_code
|
|
||||||
if [ "$#" -eq 3 ]; then
|
|
||||||
printf "[REPO] adding : $3 in $1 "
|
|
||||||
printf "\n[REPO] adding $3 in $1\n" &>> $logFile
|
|
||||||
echo $3 | sudo tee -a /etc/apt/sources.list.d/$1 &>> $logFile
|
|
||||||
ret_code=$?
|
ret_code=$?
|
||||||
retCode $ret_code
|
retCode $ret_code
|
||||||
|
if [ "$#" -eq 3 ]; then
|
||||||
|
printf "[REPO] adding : $3 in $1 "
|
||||||
|
printf "\n[REPO] adding $3 in $1\n" &>> $logFile
|
||||||
|
echo $3 | sudo tee -a /etc/apt/sources.list.d/$1 &>> $logFile
|
||||||
|
ret_code=$?
|
||||||
|
retCode $ret_code
|
||||||
|
fi
|
||||||
|
else
|
||||||
|
printf "[REPO] already added [ "$BOLDVERT"OK"$NORMAL" ] "
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -461,7 +467,7 @@ function installAppsFromList () {
|
||||||
for i in $Apps; do
|
for i in $Apps; do
|
||||||
app=(${i//;/ })
|
app=(${i//;/ })
|
||||||
if [ "${app[2]}" == "$1" ]; then
|
if [ "${app[2]}" == "$1" ]; then
|
||||||
processAppTrtFct ${app[3]} post
|
processAppTrtFct ${app[3]} pre
|
||||||
installPackage ${app[1]} ${app[0]}
|
installPackage ${app[1]} ${app[0]}
|
||||||
processAppTrtFct ${app[3]} post
|
processAppTrtFct ${app[3]} post
|
||||||
fi
|
fi
|
||||||
|
|
|
@ -133,7 +133,6 @@ corebird;apt;internet;corebird
|
||||||
telegram;apt;internet;telegram
|
telegram;apt;internet;telegram
|
||||||
skypeforlinux;apt;internet;skypeforlinux
|
skypeforlinux;apt;internet;skypeforlinux
|
||||||
nextcloud-client;apt;internet;nextcloud-client
|
nextcloud-client;apt;internet;nextcloud-client
|
||||||
nextcloud-client-caja;apt;internet;nextcloud-client-caja
|
|
||||||
deluge-gtk;apt;internet;deluge-gtk
|
deluge-gtk;apt;internet;deluge-gtk
|
||||||
deluge-torrent;apt;internet;deluge-torrent
|
deluge-torrent;apt;internet;deluge-torrent
|
||||||
vivaldi-stable;apt;internet;vivaldi-stable
|
vivaldi-stable;apt;internet;vivaldi-stable
|
||||||
|
@ -224,6 +223,7 @@ caja-wallpaper;apt;cajaplugins;caja-wallpaper
|
||||||
caja-sendto;apt;cajaplugins;caka-sendto
|
caja-sendto;apt;cajaplugins;caka-sendto
|
||||||
caja-image-converter;apt;cajaplugins;caja-image-converter
|
caja-image-converter;apt;cajaplugins;caja-image-converter
|
||||||
insync-caja;apt;cajaplugins;insync-caja
|
insync-caja;apt;cajaplugins;insync-caja
|
||||||
|
nextcloud-client-caja;apt;cajaplugins;nextcloud-client-caja
|
||||||
nautilus;apt;nautilus;nautilus
|
nautilus;apt;nautilus;nautilus
|
||||||
file-roller;apt;nautilus;file-roller
|
file-roller;apt;nautilus;file-roller
|
||||||
nautilus-terminal;apt;nautilus;nautilus-terminal
|
nautilus-terminal;apt;nautilus;nautilus-terminal
|
||||||
|
|
|
@ -93,7 +93,6 @@ entangle;apt;multimedia;entangle
|
||||||
krita;apt;multimedia;krita
|
krita;apt;multimedia;krita
|
||||||
soundconverter;apt;multimedia;soundconverter
|
soundconverter;apt;multimedia;soundconverter
|
||||||
gimp;apt;multimedia;gimp
|
gimp;apt;multimedia;gimp
|
||||||
gcolor2;apt;multimedia;gcolor2
|
|
||||||
vidcutter;apt;multimedia;vidcutter
|
vidcutter;apt;multimedia;vidcutter
|
||||||
green-recorder;apt;multimedia;green-recorder
|
green-recorder;apt;multimedia;green-recorder
|
||||||
radiotray;apt;multimedia;radiotray
|
radiotray;apt;multimedia;radiotray
|
||||||
|
@ -120,7 +119,6 @@ corebird;apt;internet;corebird
|
||||||
telegram;apt;internet;telegram
|
telegram;apt;internet;telegram
|
||||||
skypeforlinux;apt;internet;skypeforlinux
|
skypeforlinux;apt;internet;skypeforlinux
|
||||||
nextcloud-client;apt;internet;nextcloud-client
|
nextcloud-client;apt;internet;nextcloud-client
|
||||||
nextcloud-client-caja;apt;internet;nextcloud-client-caja
|
|
||||||
deluge-gtk;apt;internet;deluge-gtk
|
deluge-gtk;apt;internet;deluge-gtk
|
||||||
deluge-torrent;apt;internet;deluge-torrent
|
deluge-torrent;apt;internet;deluge-torrent
|
||||||
vivaldi-stable;apt;internet;vivaldi-stable
|
vivaldi-stable;apt;internet;vivaldi-stable
|
||||||
|
@ -204,6 +202,7 @@ caja-wallpaper;apt;cajaplugins;caja-wallpaper
|
||||||
caja-sendto;apt;cajaplugins;caka-sendto
|
caja-sendto;apt;cajaplugins;caka-sendto
|
||||||
caja-image-converter;apt;cajaplugins;caja-image-converter
|
caja-image-converter;apt;cajaplugins;caja-image-converter
|
||||||
insync-caja;apt;cajaplugins;insync-caja
|
insync-caja;apt;cajaplugins;insync-caja
|
||||||
|
nextcloud-client-caja;apt;cajaplugins;nextcloud-client-caja
|
||||||
nautilus;apt;nautilus;nautilus
|
nautilus;apt;nautilus;nautilus
|
||||||
file-roller;apt;nautilus;file-roller
|
file-roller;apt;nautilus;file-roller
|
||||||
nautilus-emblems;apt;nautilus;nautilus-emblems
|
nautilus-emblems;apt;nautilus;nautilus-emblems
|
||||||
|
@ -219,7 +218,6 @@ nautilus-ideviceinfo;apt;nautilus;nautilus-ideviceinfo
|
||||||
ooo-thumbnailer;apt;nautilus;ooo-thumbnailer
|
ooo-thumbnailer;apt;nautilus;ooo-thumbnailer
|
||||||
nautilus-dropbox;apt;nautilus;nautilus-dropbox
|
nautilus-dropbox;apt;nautilus;nautilus-dropbox
|
||||||
nautilus-script-manager;apt;nautilus;nautilus-script-manager
|
nautilus-script-manager;apt;nautilus;nautilus-script-manager
|
||||||
nautilus-columns;apt;nautilus;nautilus-columns
|
|
||||||
insync-nautilus;apt;nautilus;insync-nautilus
|
insync-nautilus;apt;nautilus;insync-nautilus
|
||||||
gtkam-gimp;apt;gimp;gtkam-gimp
|
gtkam-gimp;apt;gimp;gtkam-gimp
|
||||||
gimp-gluas;apt;gimp;gimp-gluas
|
gimp-gluas;apt;gimp;gimp-gluas
|
||||||
|
@ -262,7 +260,6 @@ purple-facebook;apt;pidgin;purple-facebook
|
||||||
unbound;apt;unbound;unbound
|
unbound;apt;unbound;unbound
|
||||||
arc-theme;apt;gtkthemes;arc-theme
|
arc-theme;apt;gtkthemes;arc-theme
|
||||||
numix-gtk-theme;apt;gtkthemes;numix-gtk-theme
|
numix-gtk-theme;apt;gtkthemes;numix-gtk-theme
|
||||||
arc-icons;apt;icons;arc-icons
|
|
||||||
faenza-icon-theme;apt;icons;faenza-icon-theme
|
faenza-icon-theme;apt;icons;faenza-icon-theme
|
||||||
numix-icon-theme;apt;icons;numix-icon-theme
|
numix-icon-theme;apt;icons;numix-icon-theme
|
||||||
numix-icon-theme-circle;apt;icons;numix-icon-theme-circle
|
numix-icon-theme-circle;apt;icons;numix-icon-theme-circle
|
||||||
|
|
|
@ -65,7 +65,7 @@ function addScreenfetchBashrc () {
|
||||||
#
|
#
|
||||||
function enableHistoryTS () {
|
function enableHistoryTS () {
|
||||||
typeset ret_code
|
typeset ret_code
|
||||||
printf "enabling CLI History TimeStamp "
|
printf "[CMD] enabling CLI History TimeStamp "
|
||||||
echo "export HISTTIMEFORMAT='%F %T '" | tee -a /home/$myHomedir/.bashrc &>> $logFile
|
echo "export HISTTIMEFORMAT='%F %T '" | tee -a /home/$myHomedir/.bashrc &>> $logFile
|
||||||
ret_code=$?
|
ret_code=$?
|
||||||
retCode $ret_code
|
retCode $ret_code
|
||||||
|
|
|
@ -102,7 +102,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do
|
||||||
installFranz
|
installFranz
|
||||||
installTeamViewer13
|
installTeamViewer13
|
||||||
installXnViewMP
|
installXnViewMP
|
||||||
toolAutoremove
|
|
||||||
;;
|
;;
|
||||||
f) # full install
|
f) # full install
|
||||||
if [ "$ygginitCount" -eq "0" ]; then
|
if [ "$ygginitCount" -eq "0" ]; then
|
||||||
|
@ -149,7 +148,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do
|
||||||
installFranz
|
installFranz
|
||||||
installTeamViewer13
|
installTeamViewer13
|
||||||
installXnViewMP
|
installXnViewMP
|
||||||
toolAutoremove
|
|
||||||
;;
|
;;
|
||||||
c) # install themes and icons
|
c) # install themes and icons
|
||||||
if [ "$ygginitCount" -eq "0" ]; then
|
if [ "$ygginitCount" -eq "0" ]; then
|
||||||
|
|
Loading…
Reference in a new issue