Install/unlock snap+store moved as unrecommanded opt + misc minor changes
This commit is contained in:
parent
083be08546
commit
e712e67e46
7 changed files with 33 additions and 12 deletions
|
@ -419,6 +419,9 @@ function checkAndInstallDep () {
|
||||||
"snap")
|
"snap")
|
||||||
installPackage snap $2
|
installPackage snap $2
|
||||||
;;
|
;;
|
||||||
|
"flatpak")
|
||||||
|
installPackage flatpak $2
|
||||||
|
;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
@ -617,6 +620,7 @@ function usage () {
|
||||||
printf " "$BOLDVERT"-s"$NORMAL" : install Solaar for Logitech Unifying devices\n"
|
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"-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"-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"-u"$NORMAL" : update system (apt,snap,...)\n"
|
||||||
printf " "$BOLDVERT"-p"$NORMAL" : clean useless packages\n"
|
printf " "$BOLDVERT"-p"$NORMAL" : clean useless packages\n"
|
||||||
printf " "$BOLDVERT"-v"$NORMAL" : show verison number\n"
|
printf " "$BOLDVERT"-v"$NORMAL" : show verison number\n"
|
||||||
|
|
|
@ -336,6 +336,7 @@ function showAppInstallMenu () {
|
||||||
"pidgin" "Pidgin plugins" \
|
"pidgin" "Pidgin plugins" \
|
||||||
"nitrogen" "Nitrogen WP Manager" \
|
"nitrogen" "Nitrogen WP Manager" \
|
||||||
"wine" "Wine Builds" \
|
"wine" "Wine Builds" \
|
||||||
|
"snap" "Unlock/Install SNAP + Store" \
|
||||||
"viber" "Viber IM desktop app" \
|
"viber" "Viber IM desktop app" \
|
||||||
"slack" "Slack App" \
|
"slack" "Slack App" \
|
||||||
"appimagelauncher" "AppImage Launcher" \
|
"appimagelauncher" "AppImage Launcher" \
|
||||||
|
@ -397,6 +398,9 @@ function showAppInstallMenu () {
|
||||||
"wine")
|
"wine")
|
||||||
installAppsFromListMenu wine
|
installAppsFromListMenu wine
|
||||||
;;
|
;;
|
||||||
|
"snap")
|
||||||
|
installAppsFromListMenu snap
|
||||||
|
;;
|
||||||
"viber")
|
"viber")
|
||||||
installViberMenu
|
installViberMenu
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -336,6 +336,7 @@ function showAppInstallMenu () {
|
||||||
"pidgin" "Pidgin plugins" \
|
"pidgin" "Pidgin plugins" \
|
||||||
"nitrogen" "Nitrogen WP Manager" \
|
"nitrogen" "Nitrogen WP Manager" \
|
||||||
"wine" "Wine Builds" \
|
"wine" "Wine Builds" \
|
||||||
|
"snap" "Unlock/Install SNAP + Store" \
|
||||||
"viber" "Viber IM desktop app" \
|
"viber" "Viber IM desktop app" \
|
||||||
"slack" "Slack App" \
|
"slack" "Slack App" \
|
||||||
"appimagelauncher" "AppImage Launcher" \
|
"appimagelauncher" "AppImage Launcher" \
|
||||||
|
@ -397,6 +398,9 @@ function showAppInstallMenu () {
|
||||||
"wine")
|
"wine")
|
||||||
installAppsFromListMenu wine
|
installAppsFromListMenu wine
|
||||||
;;
|
;;
|
||||||
|
"snap")
|
||||||
|
installAppsFromListMenu snap
|
||||||
|
;;
|
||||||
"viber")
|
"viber")
|
||||||
installViberMenu
|
installViberMenu
|
||||||
;;
|
;;
|
||||||
|
|
|
@ -20,9 +20,10 @@
|
||||||
# List of packages available
|
# List of packages available
|
||||||
# fields : package name, package manager, category, unique ID for external functions
|
# 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
|
flatpak;apt;init;flatpak
|
||||||
snapd;apt;init;snapd
|
|
||||||
ubuntu-make;apt;init;ubuntu-make
|
ubuntu-make;apt;init;ubuntu-make
|
||||||
gcc-8 g++-8;apt;init;gcc8
|
gcc-8 g++-8;apt;init;gcc8
|
||||||
ruby-dev;apt;init;ruby-dev
|
ruby-dev;apt;init;ruby-dev
|
||||||
|
@ -106,6 +107,7 @@ org.entangle_photo.Manager;flatpak;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
|
||||||
|
gimp-help-fr;apt;multimedia;gimp
|
||||||
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
|
||||||
|
@ -366,8 +368,6 @@ codeblocks;apt;codeblocks;codeblocks
|
||||||
codeblocks-contrib;apt;codeblocks;codeblocks-contrib
|
codeblocks-contrib;apt;codeblocks;codeblocks-contrib
|
||||||
geany;apt;geany;geany
|
geany;apt;geany;geany
|
||||||
geany-plugins;apt;geany;geany-plugins
|
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
|
sublime-text;apt;sublime-text;sublime-text
|
||||||
kicad;apt;cad;kicad
|
kicad;apt;cad;kicad
|
||||||
kicad-locale-fr;apt;cad;kicad-locale-fr
|
kicad-locale-fr;apt;cad;kicad-locale-fr
|
||||||
|
@ -395,7 +395,6 @@ qttools5-doc-html;apt;qt;qttools5-doc-html
|
||||||
fbreader;apt;ebook;fbreader
|
fbreader;apt;ebook;fbreader
|
||||||
calibre;apt;ebook;calibre
|
calibre;apt;ebook;calibre
|
||||||
android-studio;apt;androidstudio;androidstudio
|
android-studio;apt;androidstudio;androidstudio
|
||||||
intellij-idea-community;snap;idea;idea
|
|
||||||
com.axosoft.GitKraken;flatpak;gitkraken;gitkraken
|
com.axosoft.GitKraken;flatpak;gitkraken;gitkraken
|
||||||
xserver-xorg-hwe-18.04;apt;hwe;xserver-xorg-hwe-18.04
|
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
|
xserver-xorg-video-all-hwe-18.04;apt;hwe;xserver-xorg-video-all-hwe-18.04
|
||||||
|
|
|
@ -20,9 +20,10 @@
|
||||||
# List of packages available
|
# List of packages available
|
||||||
# fields : package name, package manager, category, unique ID for external functions
|
# 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
|
flatpak;apt;init;flatpak
|
||||||
snapd;apt;init;snapd
|
|
||||||
ubuntu-make;apt;init;ubuntu-make
|
ubuntu-make;apt;init;ubuntu-make
|
||||||
ruby-dev;apt;init;ruby-dev
|
ruby-dev;apt;init;ruby-dev
|
||||||
nodejs;apt;init;nodejslts
|
nodejs;apt;init;nodejslts
|
||||||
|
@ -96,6 +97,7 @@ org.entangle_photo.Manager;flatpak;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
|
||||||
|
gimp-help-fr;apt;multimedia;gimp
|
||||||
quodlibet;apt;multimedia;quodlibet
|
quodlibet;apt;multimedia;quodlibet
|
||||||
peek;apt;multimedia;peek
|
peek;apt;multimedia;peek
|
||||||
bino;apt;multimedia;bino
|
bino;apt;multimedia;bino
|
||||||
|
@ -340,8 +342,6 @@ codeblocks-contrib;apt;codeblocks;codeblocks-contrib
|
||||||
geany;apt;geany;geany
|
geany;apt;geany;geany
|
||||||
geany-plugins;apt;geany;geany-plugins
|
geany-plugins;apt;geany;geany-plugins
|
||||||
io.brackets.Brackets;flatpak;brackets;brackets
|
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
|
sublime-text;apt;sublime-text;sublime-text
|
||||||
kicad;apt;cad;kicad
|
kicad;apt;cad;kicad
|
||||||
librecad;apt;cad;librecad
|
librecad;apt;cad;librecad
|
||||||
|
@ -365,7 +365,6 @@ qttools5-doc-html;apt;qt;qttools5-doc-html
|
||||||
fbreader;apt;ebook;fbreader
|
fbreader;apt;ebook;fbreader
|
||||||
calibre;apt;ebook;calibre
|
calibre;apt;ebook;calibre
|
||||||
android-studio;apt;androidstudio;androidstudio
|
android-studio;apt;androidstudio;androidstudio
|
||||||
intellij-idea-community;snap;idea;idea
|
|
||||||
com.axosoft.GitKraken;flatpak;gitkraken;gitkraken
|
com.axosoft.GitKraken;flatpak;gitkraken;gitkraken
|
||||||
linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04"
|
linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04"
|
||||||
|
|
||||||
|
|
2
vars.sh
2
vars.sh
|
@ -13,7 +13,7 @@
|
||||||
#
|
#
|
||||||
# app version number
|
# app version number
|
||||||
#
|
#
|
||||||
version="0.6.0-b9"
|
version="0.6.1-b1"
|
||||||
|
|
||||||
#
|
#
|
||||||
# myHomedir is used in full paths to the homedir
|
# myHomedir is used in full paths to the homedir
|
||||||
|
|
13
yggdrasil.sh
13
yggdrasil.sh
|
@ -67,7 +67,7 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >>
|
||||||
#
|
#
|
||||||
# arguments/options management with getopts
|
# 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
|
case "$option" in
|
||||||
a) # install all apps
|
a) # install all apps
|
||||||
if [ $ygginitCount = false ]; then
|
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)"
|
msg "Installing HWE (newer kernel+xorg)"
|
||||||
installAppsFromList hwe
|
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)
|
u)
|
||||||
msg "Initializing"
|
msg "Initializing"
|
||||||
yggInit
|
yggInit
|
||||||
|
|
Loading…
Reference in a new issue