francois/yggdrasil_ng
francois/yggdrasil_ng
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Install/unlock snap+store moved as unrecommanded opt + misc minor changes

Browse source
This commit is contained in:
Francois B. (Makoto) 2020-07-04 19:25:35 +02:00
parent 083be08546
commit e712e67e46
7 changed files with 33 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core_functions.sh
View file

@ -419,6 +419,9 @@ function checkAndInstallDep () {
"snap")
installPackage snap $2
;;
"flatpak")
installPackage flatpak $2
;;
esac
fi
}
@ -617,6 +620,7 @@ function usage () {
printf " "$BOLDVERT"-s"$NORMAL" : install Solaar for Logitech Unifying devices\n"
printf " "$BOLDVERT"-t"$NORMAL" : install TLP for Laptops and low energy usage\n"
printf " "$BOLDVERT"-k"$NORMAL" : install HWE (Ubuntu's Hardware Enablement Stack)(newer kernel+xorg)\n"
printf " "$BOLDVERT"-g"$NORMAL" : install/unlock SNAP + Store (not recommanded ;-))\n"
printf " "$BOLDVERT"-u"$NORMAL" : update system (apt,snap,...)\n"
printf " "$BOLDVERT"-p"$NORMAL" : clean useless packages\n"
printf " "$BOLDVERT"-v"$NORMAL" : show verison number\n"

4
menus_functions_ub1804.sh
View file

@ -336,6 +336,7 @@ function showAppInstallMenu () {
"pidgin" "Pidgin plugins" \
"nitrogen" "Nitrogen WP Manager" \
"wine" "Wine Builds" \
"snap" "Unlock/Install SNAP + Store" \
"viber" "Viber IM desktop app" \
"slack" "Slack App" \
"appimagelauncher" "AppImage Launcher" \
@ -397,6 +398,9 @@ function showAppInstallMenu () {
"wine")
installAppsFromListMenu wine
;;
"snap")
installAppsFromListMenu snap
;;
"viber")
installViberMenu
;;

4
menus_functions_ub2004.sh
View file

@ -336,6 +336,7 @@ function showAppInstallMenu () {
"pidgin" "Pidgin plugins" \
"nitrogen" "Nitrogen WP Manager" \
"wine" "Wine Builds" \
"snap" "Unlock/Install SNAP + Store" \
"viber" "Viber IM desktop app" \
"slack" "Slack App" \
"appimagelauncher" "AppImage Launcher" \
@ -397,6 +398,9 @@ function showAppInstallMenu () {
"wine")
installAppsFromListMenu wine
;;
"snap")
installAppsFromListMenu snap
;;
"viber")
installViberMenu
;;

9
repo_functions_ub1804.sh
View file

@ -20,9 +20,10 @@
# List of packages available
# fields : package name, package manager, category, unique ID for external functions
#
Apps="apt-transport-https;apt;init;apt-transport-https
Apps="snapd;apt;snap;snapd
snap-store;snap;snap;snap-store
apt-transport-https;apt;init;apt-transport-https
flatpak;apt;init;flatpak
snapd;apt;init;snapd
ubuntu-make;apt;init;ubuntu-make
gcc-8 g++-8;apt;init;gcc8
ruby-dev;apt;init;ruby-dev
@ -106,6 +107,7 @@ org.entangle_photo.Manager;flatpak;multimedia;entangle
krita;apt;multimedia;krita
soundconverter;apt;multimedia;soundconverter
gimp;apt;multimedia;gimp
gimp-help-fr;apt;multimedia;gimp
vidcutter;apt;multimedia;vidcutter
green-recorder;apt;multimedia;green-recorder
radiotray;apt;multimedia;radiotray
@ -366,8 +368,6 @@ codeblocks;apt;codeblocks;codeblocks
codeblocks-contrib;apt;codeblocks;codeblocks-contrib
geany;apt;geany;geany
geany-plugins;apt;geany;geany-plugins
pycharm-community;snap;pycharm-community;pycharm-community
pycharm-professional;snap;pycharm-professional;pycharm-professional
sublime-text;apt;sublime-text;sublime-text
kicad;apt;cad;kicad
kicad-locale-fr;apt;cad;kicad-locale-fr
@ -395,7 +395,6 @@ qttools5-doc-html;apt;qt;qttools5-doc-html
fbreader;apt;ebook;fbreader
calibre;apt;ebook;calibre
android-studio;apt;androidstudio;androidstudio
intellij-idea-community;snap;idea;idea
com.axosoft.GitKraken;flatpak;gitkraken;gitkraken
xserver-xorg-hwe-18.04;apt;hwe;xserver-xorg-hwe-18.04
xserver-xorg-video-all-hwe-18.04;apt;hwe;xserver-xorg-video-all-hwe-18.04

9
repo_functions_ub2004.sh
View file

@ -20,9 +20,10 @@
# List of packages available
# fields : package name, package manager, category, unique ID for external functions
#
Apps="apt-transport-https;apt;init;apt-transport-https
Apps="snapd;apt;snap;snapd
snap-store;snap;snap;snap-store
apt-transport-https;apt;init;apt-transport-https
flatpak;apt;init;flatpak
snapd;apt;init;snapd
ubuntu-make;apt;init;ubuntu-make
ruby-dev;apt;init;ruby-dev
nodejs;apt;init;nodejslts
@ -96,6 +97,7 @@ org.entangle_photo.Manager;flatpak;multimedia;entangle
krita;apt;multimedia;krita
soundconverter;apt;multimedia;soundconverter
gimp;apt;multimedia;gimp
gimp-help-fr;apt;multimedia;gimp
quodlibet;apt;multimedia;quodlibet
peek;apt;multimedia;peek
bino;apt;multimedia;bino
@ -340,8 +342,6 @@ codeblocks-contrib;apt;codeblocks;codeblocks-contrib
geany;apt;geany;geany
geany-plugins;apt;geany;geany-plugins
io.brackets.Brackets;flatpak;brackets;brackets
pycharm-community;snap;pycharm-community;pycharm-community
pycharm-professional;snap;pycharm-professional;pycharm-professional
sublime-text;apt;sublime-text;sublime-text
kicad;apt;cad;kicad
librecad;apt;cad;librecad
@ -365,7 +365,6 @@ qttools5-doc-html;apt;qt;qttools5-doc-html
fbreader;apt;ebook;fbreader
calibre;apt;ebook;calibre
android-studio;apt;androidstudio;androidstudio
intellij-idea-community;snap;idea;idea
com.axosoft.GitKraken;flatpak;gitkraken;gitkraken
linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04"

2
vars.sh
View file

@ -13,7 +13,7 @@
#
# app version number
#
version="0.6.0-b9"
version="0.6.1-b1"
#
# myHomedir is used in full paths to the homedir

13
yggdrasil.sh
View file

@ -67,7 +67,7 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >>
#
# arguments/options management with getopts
while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do
while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,k,p" option; do
case "$option" in
a) # install all apps
if [ $ygginitCount = false ]; then
@ -238,6 +238,17 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do
msg "Installing HWE (newer kernel+xorg)"
installAppsFromList hwe
;;
g) # Unlock+Install SNAP + Store
if [ $ygginitCount = false ]; then
msg "Initializing"
yggInit
msg "Updating the system"
updateSystem
ygginitCount=true
fi
msg "Unlock/Install SNAP + Store"
installAppsFromList snap
;;
u)
msg "Initializing"
yggInit