From 180e43974c61653a56cb777961cbd3e2b112c2ef Mon Sep 17 00:00:00 2001 From: shakasan Date: Thu, 17 May 2018 08:59:57 +0200 Subject: [PATCH 001/261] droopscan removed --- repo_functions.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/repo_functions.sh b/repo_functions.sh index 49041bc..46f750c 100644 --- a/repo_functions.sh +++ b/repo_functions.sh @@ -210,7 +210,6 @@ aircrack-ng;apt;nettools;aricrack-ng SpoofMAC;pip;nettools;SpoofMAC speedtest-cli;pip;nettools;speedtest-cli whatportis;pip;nettools;whatportis -droopescan;pip;nettools;droopescan nethogs;apt;nettools;nethogs ssh_scan;gem;nettools;sshscan caja-share;apt;cajaplugins;caja-share From b0a79d08a6985d9881820faeba5ce0104aac6353 Mon Sep 17 00:00:00 2001 From: shakasan Date: Thu, 17 May 2018 09:08:20 +0200 Subject: [PATCH 002/261] cpu microcode update fct fixed --- install_functions.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/install_functions.sh b/install_functions.sh index 491ffa7..b4dc160 100644 --- a/install_functions.sh +++ b/install_functions.sh @@ -396,16 +396,20 @@ function installCardReaderMenu () { # update AMD/Intel CPU Microcode # function updateMicrocode () { + msg "CPU Microcode updating" oldMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` intel=`cat /proc/cpuinfo | grep -i Intel | wc -l` amd=`cat /proc/cpuinfo | grep -i Amd | wc -l` if [ "$intel" -gt "0" ]; then + printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" installPackage apt intel-microcode elif [ "$amd" -gt "0" ]; then installPackage apt amd64-microcode + printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" + elif + printf "[INFO] No Intel/AMD CPU found" fi newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` - printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" printf "\n" } From 6b3924228235b6eea8f6487a46d02e4321298c0d Mon Sep 17 00:00:00 2001 From: shakasan Date: Thu, 17 May 2018 13:15:48 +0200 Subject: [PATCH 003/261] some bugs fixed about shortcut icons --- install_functions.sh | 7 ------- repo_functions.sh | 4 ++-- 2 files changed, 2 insertions(+), 9 deletions(-) diff --git a/install_functions.sh b/install_functions.sh index b4dc160..cc8fac9 100644 --- a/install_functions.sh +++ b/install_functions.sh @@ -774,13 +774,6 @@ SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir runCmd "sudo service udev restart" \ "restarting UDEV service" - - createAppShortcut "/home/"$myHomedir"/tools/Android/Sdk/tools/android" \ - "/home/"$myHomedir"/.icons/android.png" \ - "GNOME;GTK;Development;IDE" \ - "Android SDK" \ - "local" \ - update-menus } # diff --git a/repo_functions.sh b/repo_functions.sh index 46f750c..d363c6b 100644 --- a/repo_functions.sh +++ b/repo_functions.sh @@ -1215,7 +1215,7 @@ function qt_TrtFct () { "set QT5 as default" createAppShortcut "/usr/bin/designer" \ - "/home/"$myHomedir"/.icons/qtdesigner.png" \ + "" \ "GNOME;GTK;Development;IDE" \ "QT Designer 5" \ "local" \ @@ -1243,7 +1243,7 @@ function nitrogen_TrtFct () { "disabling Caja desktop icons management" createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ - "/home/"$myHomedir".icons/franz.png" \ + "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ "Network;InstantMessaging" \ "Nitrogen" \ "local" \ From 55e5613a66258c2abf1e386aed13c894230aeea4 Mon Sep 17 00:00:00 2001 From: shakasan Date: Thu, 17 May 2018 13:50:07 +0200 Subject: [PATCH 004/261] add udev android rules to android studio TrtFct --- install_functions.sh | 43 ------------------------------------ repo_functions.sh | 52 +++++++++++++++++++++++++++++++++++++++++++- 2 files changed, 51 insertions(+), 44 deletions(-) diff --git a/install_functions.sh b/install_functions.sh index cc8fac9..38b75b5 100644 --- a/install_functions.sh +++ b/install_functions.sh @@ -731,49 +731,6 @@ function installAndroidEnv () { runCmd "touch /home/$myHomedir/.bashrc" \ "creating .bashrc file if necessary" sh -c "echo '\n\nexport PATH=${PATH}:/home/'$myHomedir'/Android/Sdk/tools:/home/'$myHomedir'/Android/Sdk/platform-tools' >> /home/$myHomedir/.bashrc" - - msg "Adding UDEV rules" - sudo sh -c "echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0502\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Acer\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0b05\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Asus\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"413c\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Dell\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0489\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Foxconn\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04c5\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Fujitsu\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04c5\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Fujitsu-Toshiba\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"091e\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Garmin-Asus\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"18d1\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Google-Nexus\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"201E\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Haier\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"109b\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Hisense\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0bb4\", MODE=\"0666\", OWNER=\""$myHomedir"\" # HTC\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"12d1\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Huawei\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"8087\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Intel\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"24e3\", MODE=\"0666\", OWNER=\""$myHomedir"\" # K-Touch\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2116\", MODE=\"0666\", OWNER=\""$myHomedir"\" # KT Tech\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0482\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Kyocera\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"17ef\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Lenovo\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1004\", MODE=\"0666\", OWNER=\""$myHomedir"\" # LG\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"22b8\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Motorola\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0e8d\", MODE=\"0666\", OWNER=\""$myHomedir"\" # MTK\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0409\", MODE=\"0666\", OWNER=\""$myHomedir"\" # NEC\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2080\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Nook\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0955\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Nvidia\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2257\", MODE=\"0666\", OWNER=\""$myHomedir"\" # OTGV\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"10a9\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Pantech\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1d4d\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Pegatron\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0471\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Philips\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04da\", MODE=\"0666\", OWNER=\""$myHomedir"\" # PMC-Sierra\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"05c6\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Qualcomm\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1f53\", MODE=\"0666\", OWNER=\""$myHomedir"\" # SK Telesys\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04e8\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Samsung\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04dd\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sharp\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"054c\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0fce\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony Ericsson\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0fce\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony Mobile Communications\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2340\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Teleepoch\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0930\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Toshiba\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir"\" # ZTE' > /etc/udev/rules.d/99-android.rules" - - runCmd "sudo service udev restart" \ - "restarting UDEV service" } # diff --git a/repo_functions.sh b/repo_functions.sh index d363c6b..213ebe6 100644 --- a/repo_functions.sh +++ b/repo_functions.sh @@ -1177,7 +1177,57 @@ function addRepo_AndroidStudio () { AppsTrtFct="nitrogen;nitrogen_TrtFct mongodb;mongodb_TrtFct qttools5-dev-tools;qt_TrtFct -plank;plank_TrtFct" +plank;plank_TrtFct +androidstudio;android_TrtFct" + +# +# +# +function android_TrtFct () { + msg "Adding Android devices UDEV rules" + + sudo sh -c "echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0502\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Acer\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0b05\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Asus\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"413c\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Dell\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0489\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Foxconn\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04c5\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Fujitsu\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04c5\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Fujitsu-Toshiba\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"091e\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Garmin-Asus\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"18d1\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Google-Nexus\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"201E\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Haier\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"109b\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Hisense\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0bb4\", MODE=\"0666\", OWNER=\""$myHomedir"\" # HTC\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"12d1\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Huawei\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"8087\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Intel\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"24e3\", MODE=\"0666\", OWNER=\""$myHomedir"\" # K-Touch\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2116\", MODE=\"0666\", OWNER=\""$myHomedir"\" # KT Tech\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0482\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Kyocera\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"17ef\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Lenovo\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1004\", MODE=\"0666\", OWNER=\""$myHomedir"\" # LG\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"22b8\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Motorola\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0e8d\", MODE=\"0666\", OWNER=\""$myHomedir"\" # MTK\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0409\", MODE=\"0666\", OWNER=\""$myHomedir"\" # NEC\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2080\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Nook\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0955\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Nvidia\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2257\", MODE=\"0666\", OWNER=\""$myHomedir"\" # OTGV\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"10a9\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Pantech\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1d4d\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Pegatron\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0471\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Philips\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04da\", MODE=\"0666\", OWNER=\""$myHomedir"\" # PMC-Sierra\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"05c6\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Qualcomm\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1f53\", MODE=\"0666\", OWNER=\""$myHomedir"\" # SK Telesys\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04e8\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Samsung\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04dd\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sharp\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"054c\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0fce\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony Ericsson\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0fce\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony Mobile Communications\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2340\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Teleepoch\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0930\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Toshiba\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir"\" # ZTE' > /etc/udev/rules.d/99-android.rules" + + runCmd "sudo service udev restart" \ + "restarting UDEV service" +} # # Plank themes From f10c1a7bd0cce36e8df63f5fa63e3a431e42add9 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 19 May 2018 06:08:29 +0200 Subject: [PATCH 005/261] small bug about source fixed --- yggdrasil.sh | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-) diff --git a/yggdrasil.sh b/yggdrasil.sh index c8c6b2a..906886a 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -11,21 +11,12 @@ # include functions and vars from external files # dir=$(dirname $0) -if [ ! $dir == "/opt/yggdrasil" ]; then - source /opt/yggdrasil/vars.sh - source /opt/yggdrasil/core_functions.sh - source /opt/yggdrasil/repo_functions.sh - source /opt/yggdrasil/install_functions.sh - source /opt/yggdrasil/menus_functions.sh - source /opt/yggdrasil/tools_functions.sh -else - source $(dirname $0)/vars.sh - source $(dirname $0)/core_functions.sh - source $(dirname $0)/repo_functions.sh - source $(dirname $0)/install_functions.sh - source $(dirname $0)/menus_functions.sh - source $(dirname $0)/tools_functions.sh -fi +source /opt/yggdrasil/vars.sh +source /opt/yggdrasil/core_functions.sh +source /opt/yggdrasil/repo_functions.sh +source /opt/yggdrasil/install_functions.sh +source /opt/yggdrasil/menus_functions.sh +source /opt/yggdrasil/tools_functions.sh # # check if the script is running in root/sudo From fc5cd0723395cb466fd9d0225d13d8ca884f0e44 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 19 May 2018 06:18:44 +0200 Subject: [PATCH 006/261] add nodejs trtfct to remove craps from ubuntu officiel version of node --- repo_functions.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/repo_functions.sh b/repo_functions.sh index 213ebe6..0a9ded1 100644 --- a/repo_functions.sh +++ b/repo_functions.sh @@ -1178,11 +1178,25 @@ AppsTrtFct="nitrogen;nitrogen_TrtFct mongodb;mongodb_TrtFct qttools5-dev-tools;qt_TrtFct plank;plank_TrtFct -androidstudio;android_TrtFct" +androidstudio;android_TrtFct +nodejs8lts;nodejs8lts_TrtFct" # # # +function nodejs8lts_TrtFct () { + msg "Sanitizing NodeJS install" + if which /usr/local/bin/node >/dev/null; then + runCmd "sudo rm /usr/local/bin/node" \ + "cleaning/removing legacy node files" + else + print "[INFO] nothing to clean, good :-)" + fi +} + +# +# Android Env for adb, fastboot, .... +# function android_TrtFct () { msg "Adding Android devices UDEV rules" From 99145ec623b0c193ac871d6adc95e78d025d537e Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 22 May 2018 19:23:34 +0200 Subject: [PATCH 007/261] dropbox replaced by nautilus-dropbox --- repo_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions.sh b/repo_functions.sh index 0a9ded1..135c231 100644 --- a/repo_functions.sh +++ b/repo_functions.sh @@ -115,7 +115,7 @@ xchat-gnome;apt;internet;xchat-gnome xchat-gnome-indicator;apt;internet;xchat-gnome-indicator chromium-browser;apt;internet;chromium-browser chromium-browser-l10n;apt;internet;chromium-browser-l10n -dropbox;apt;internet;dropbox +nautilus-dropbox;apt;internet;nautilus-dropbox filezilla;apt;internet;filezilla hexchat;apt;internet;hexchat mumble;apt;internet;mumble From 3443bf1f13aeadd5fc1ff180928eb57dc18a4647 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 22 May 2018 19:28:29 +0200 Subject: [PATCH 008/261] steam headless install fixed --- install_functions.sh | 19 +++---------------- 1 file changed, 3 insertions(+), 16 deletions(-) diff --git a/install_functions.sh b/install_functions.sh index 38b75b5..0ecb305 100644 --- a/install_functions.sh +++ b/install_functions.sh @@ -166,14 +166,9 @@ function installGamesMenu () { # Steam (headless) # function installSteam () { - runCmd "echo steam steam/purge note | sudo debconf-set-selections" \ - "accepting steam licence" - - runCmd "echo steam steam/license note | sudo debconf-set-selections" \ - "accepting steam licence 2/3" - - runCmd "echo steam steam/question select I AGREE | sudo debconf-set-selections" \ - "accepting steam licence 3/3" + runCmd "echo steam steam/purge \"note\" | sudo debconf-set-selections \"accepting steam licence\"" + runCmd "echo steam steam/license \"note\" | sudo debconf-set-selections \"accepting steam licence 2/3\"" + runCmd "echo steam steam/question select \"I AGREE\" | sudo debconf-set-selections \"accepting steam licence 3/3\"" installPackage apt steam } @@ -181,14 +176,6 @@ function installSteam () { # Steam (Menu) # function installSteamMenu () { - runCmd "echo steam steam/purge note | sudo debconf-set-selections" \ - "accepting steam licence" - - runCmd "echo steam steam/license note | sudo debconf-set-selections" \ - "accepting steam licence 2/3" - - runCmd "echo steam steam/question select I AGREE | sudo debconf-set-selections" \ - "accepting steam licence 3/3" installPackage apt steam } From ae2511e0a3784ef7765aef47b42c157a2a1de7ed Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 22 May 2018 19:52:44 +0200 Subject: [PATCH 009/261] small change in nitrogen postTrtFct about shortcut --- repo_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions.sh b/repo_functions.sh index 135c231..cfb15c8 100644 --- a/repo_functions.sh +++ b/repo_functions.sh @@ -1308,7 +1308,7 @@ function nitrogen_TrtFct () { createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ - "Network;InstantMessaging" \ + "Utility;GTK" \ "Nitrogen" \ "local" \ "start" From df59c133b718b13e9f79f210028bb26a673c92b7 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 26 May 2018 20:28:26 +0200 Subject: [PATCH 010/261] small syntax bug --- install_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_functions.sh b/install_functions.sh index 0ecb305..5238071 100644 --- a/install_functions.sh +++ b/install_functions.sh @@ -393,7 +393,7 @@ function updateMicrocode () { elif [ "$amd" -gt "0" ]; then installPackage apt amd64-microcode printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" - elif + else printf "[INFO] No Intel/AMD CPU found" fi newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` From 2b198c41032f90ed5de6586a447040181e40071e Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 26 May 2018 20:54:20 +0200 Subject: [PATCH 011/261] some fix about unbound install and menu --- install_functions.sh | 9 +-------- menus_functions.sh | 6 ++++++ yggdrasil.sh | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/install_functions.sh b/install_functions.sh index 5238071..e4abfd5 100644 --- a/install_functions.sh +++ b/install_functions.sh @@ -895,13 +895,6 @@ function installTeamViewer13Menu () { # # install/enable Unboud (headless) # -function enableUnbound () { +function installUnbound () { installAppsFromList unbound } - -# -# install/enable Unboud (Menu) -# -function enableUnboundMenu () { - installAppsFromListMenu unbound -} \ No newline at end of file diff --git a/menus_functions.sh b/menus_functions.sh index 9e80cf0..3eb1ec2 100644 --- a/menus_functions.sh +++ b/menus_functions.sh @@ -56,6 +56,7 @@ function showConfigMenu () { "screenfetch" "screenfetch added to .bashrc" \ "historyTS" "TimeStamp enabled in Shell History" \ "unattendedUpgrades" "Enable automatic security updates" \ + "Unbound" "Enable Unbound DNS Cache server" \ "Back" "Back" 3>&1 1>&2 2>&3) case $configMenuOptions in @@ -89,6 +90,11 @@ function showConfigMenu () { installUnattendedUpgrades pressKey ;; + "Unbound") + clear + installUnbound + pressKey + ;; "Back") break ;; diff --git a/yggdrasil.sh b/yggdrasil.sh index 906886a..6a12f10 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -144,7 +144,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do d) # install Unbound DNS Cache yggInit updateSystem - enableUnbound + installUnbound exit ;; q) # cardreader From 80ed0d1b2e9e7ff1719c242edfda3de5528bc8a0 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 26 May 2018 23:16:58 +0200 Subject: [PATCH 012/261] small change in yggInit about umake ppa --- core_functions.sh | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index f916408..1c54fbc 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -119,13 +119,8 @@ function yggInit () { printf "[INIT] i386 architecture already added [ "$BOLDVERT"OK"$NORMAL" ] \n" fi - if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -q ubuntu-make; then - printf "[INIT][UMAKE] PPA not found, adding PPA...\n" - printf "[INIT][UMAKE] PPA not found, adding PPA...\n" &>> $logFile - addPPA "ubuntu-desktop/ubuntu-make" - else - printf "[INIT][UMAKE] PPA found [ "$BOLDVERT"OK"$NORMAL" ] \n" - fi + printf "[INIT]" + addPPA ppa:ubuntu-desktop/ubuntu-make printf "[INIT][APT] update " printf "\n[INIT][APT] update\n" &>> $logFile From 2597a9dd6b84c0ad3faaf2f52354deb697e9739b Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 26 May 2018 23:25:15 +0200 Subject: [PATCH 013/261] functions in external files splited in 16.04 and 18.04 versions to prepare next steps --- core_functions.sh => core_functions_ub1604.sh | 0 core_functions_ub1804.sh | 655 ++++++++ ...unctions.sh => install_functions_ub1604.sh | 0 install_functions_ub1804.sh | 900 +++++++++++ ..._functions.sh => menus_functions_ub1604.sh | 0 menus_functions_ub1804.sh | 475 ++++++ repo_functions.sh => repo_functions_ub1604.sh | 0 repo_functions_ub1804.sh | 1319 +++++++++++++++++ ..._functions.sh => tools_functions_ub1604.sh | 0 tools_functions_ub1804.sh | 145 ++ yggdrasil.sh | 22 +- 11 files changed, 3511 insertions(+), 5 deletions(-) rename core_functions.sh => core_functions_ub1604.sh (100%) create mode 100644 core_functions_ub1804.sh rename install_functions.sh => install_functions_ub1604.sh (100%) create mode 100644 install_functions_ub1804.sh rename menus_functions.sh => menus_functions_ub1604.sh (100%) create mode 100644 menus_functions_ub1804.sh rename repo_functions.sh => repo_functions_ub1604.sh (100%) create mode 100644 repo_functions_ub1804.sh rename tools_functions.sh => tools_functions_ub1604.sh (100%) create mode 100644 tools_functions_ub1804.sh diff --git a/core_functions.sh b/core_functions_ub1604.sh similarity index 100% rename from core_functions.sh rename to core_functions_ub1604.sh diff --git a/core_functions_ub1804.sh b/core_functions_ub1804.sh new file mode 100644 index 0000000..1c54fbc --- /dev/null +++ b/core_functions_ub1804.sh @@ -0,0 +1,655 @@ +#------------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#------------------------------------------------------------------------------# + +#------------------------------------------------------------------------------# +# core functions # +#------------------------------------------------------------------------------# + +# +# display a simple message + CR +# +function smsgn () { + printf "$*\n" +} + +# +# display a simple message +# +function smsg () { + printf "$*" +} + +# +# display a message + notification +# +function msg () { + printf "\n" + printf $JAUNE + if [ "$#" -gt "0" ]; then + printf "$*\n" + /usr/bin/notify-send -t 7000 "$*" + fi + printf $NORMAL +} + +# +# display a message between [ ] depending of the ret_code +# +function retCode () { + typeset ret_code="$1" + if [ $ret_code == 0 ]; then + printf "[ "$BOLDVERT"OK"$NORMAL" ] " + else + printf "[ "$BOLDROUGE"!!"$NORMAL" ] " + fi + printf "\n" +} + +# +# run a shell command and display a message between [ ] depending on the ret_code +# +function runCmd () { + typeset cmd="$1" + typeset txt="$2" + typeset ret_code + + printf "[CMD] $txt " + printf "\n[CMD] $txt : $cmd\n" &>> $logFile + eval $cmd" &>> $logFile" + ret_code=$? + retCode $ret_code +} + +# +# display a message + notification + ask to push a key to continue +# +function pressKey () { + printf "$*\n" + if which mpg123 >/dev/null; then + mpg123 -q /opt/yggdrasil/notify.mp3 & + fi + printf $INV + read -p "Press key to continue ..." + printf $NORMAL +} + +# +# check if OS is Mint +# +function isMint () { + OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` + if [[ $OS == *"Linux Mint 18"* ]]; then + return 0 + else + return 1 + fi +} + +# +# check if DE is Mate +# +function isMate () { + if [[ $DESKTOP_SESSION == *"mate"* ]]; then + return 0 + else + return 1 + fi +} + +# +# check and install required dependencies for Yggdrasil +# +function yggInit () { + typeset ret_code + + printf "[INIT]" + runCmd "echo sience-config science-config/group select '$myHomedir ($myHomedir)' | sudo debconf-set-selections" \ + "apply settings for science-config pkg" + + if ! dpkg --print-foreign-architectures | grep -qi i386; then + printf "[INIT]" + runCmd "sudo dpkg --add-architecture i386" \ + "adding i386 architecture" + else + printf "[INIT] i386 architecture already added [ "$BOLDVERT"OK"$NORMAL" ] \n" + fi + + printf "[INIT]" + addPPA ppa:ubuntu-desktop/ubuntu-make + + printf "[INIT][APT] update " + printf "\n[INIT][APT] update\n" &>> $logFile + sudo apt-get update &>> $logFile + ret_code=$? + retCode $ret_code + + printf "[INIT]" + installPackage apt "apt-transport-https" + + if ! which umake >/dev/null; then + printf "[INIT][UMAKE] not found, installing...\n" + printf "\n[INIT][UMAKE] not found, installing...\n" &>> $logFile + installPackage apt "ubuntu-make" + else + printf "[INIT][UMAKE] found [ "$BOLDVERT"OK"$NORMAL" ] \n" + fi + + if ! which gem >/dev/null; then + printf "[INIT][GEM] not found, installing...\n" + printf "\n[INIT][GEM] not found, installing...\n" &>> $logFile + installPackage apt "ruby-dev" + else + printf "[INIT][GEM] found [ "$BOLDVERT"OK"$NORMAL" ] \n" + fi + + if ! which snap >/dev/null; then + printf "[INIT][SNAP] not found, installing...\n" + printf "\n[INIT][SNAP] not found, installing...\n" &>> $logFile + installPackage apt "snapd" + else + printf "[INIT][SNAP] found [ "$BOLDVERT"OK"$NORMAL" ] \n" + fi + + if ! which npm >/dev/null; then + printf "[INIT][NPM] not found, installing...\n" + printf "\n[INIT][NPM] not found, installing...\n" &>> $logFile + installPackage apt "nodejs" + else + printf "[INIT][NPM] found [ "$BOLDVERT"OK"$NORMAL" ] \n" + fi + + if ! which pip3 >/dev/null; then + printf "[INIT][PIP] not found, installing...\n" + printf "\n[INIT][PIP] not found, installing...\n" &>> $logFile + printf "[INIT]" + installPackage apt "python3-pip" + printf "[INIT]" + installPackage pip "pip" + printf "[INIT]" + installPackage pip "setuptools" + else + printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n" + printf "[INIT]" + installPackage pip "pip" + printf "[INIT]" + installPackage pip "setuptools" + fi +} + +# +# update kernel to the latest version +# +function kernelUpdate () { + checkAndInstallDep apt ukuu ukuu \ + && runCmd "sudo ukuu --install-latest --yes" \ + "installing latest kernel" +} + +# +# system update +#TODO: add pip, npm (yarn?), gem +# +function updateSystem () { + typeset ret_code + + printf "[APT] update " + printf "\n[APT] update\n" &>> $logFile + sudo apt-get update &>> $logFile + ret_code=$? + retCode $ret_code + + printf "[APT] upgrade " + printf "\n[APT] upgrade\n" &>> $logFile + sudo apt-get -y upgrade &>> $logFile + ret_code=$? + retCode $ret_code + + printf "[APT] dist-upgrade " + printf "\n[APT] dist-upgrade\n" &>> $logFile + sudo apt-get -y dist-upgrade &>> $logFile + ret_code=$? + retCode $ret_code + + if which snap >/dev/null; then + printf "[SNAP] refresh " + printf "\n[SNAP] refresh\n" &>> $logFile + sudo snap refresh &>> $logFile + ret_code=$? + retCode $ret_code + fi + + repoAdded=0 +} + +# +# add ppa +# input : ppa name +# +function addPPA () { + typeset ret_code + + prefix="ppa:" + str="$*" + str2search=${str#$prefix} + + if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -q ${str2search}; then + printf "[PPA] adding : $* " + printf "\n[PPA] adding $*\n" &>> $logFile + sudo add-apt-repository -y $* &>> $logFile + ret_code=$? + retCode $ret_code + else + printf "[PPA] PPA already added [ "$BOLDVERT"OK"$NORMAL" ] \n" + fi +} + +# +# add repo's key +# input : file's url OR keyserver + key +# +function addKey () { + typeset ret_code + + case $# in + "1") + printf "[REPO] adding key from file : $1 " + printf "\n[REPO] adding key from file $1\n" &>> $logFile + wget -qO - $1 | sudo apt-key add - &>> $logFile + ret_code=$? + retCode $ret_code + ;; + "2") + printf "[REPO] adding key $2 from $1 " + printf "\n[REPO] adding key $2 from $1\n" &>> $logFile + gpg --keyserver $1 --recv-keys $2 &>> $logFile \ + && gpg -a --export $2 | sudo apt-key add - &>> $logFile + ret_code=$? + retCode $ret_code + ;; + esac +} + +# +# create new entry in /etc/apt/source.list.d/ +# input : filename, repo, src repo +# +function addRepo () { + typeset ret_code + printf "[REPO] adding : $2 in $1 " + printf "\n[REPO] adding $2 in $1\n" &>> $logFile + echo $2 | sudo tee /etc/apt/sources.list.d/$1 &>> $logFile + 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 +} + +# +# install package manually +# input : url of package, package name, menu mode +# +function installPackageDpkg () { + printf "[PKG] Installing $2 from $1 " + printf "\n[PKG] installing $2 from $1\n" &>> $logFile + cd /tmp \ + && wget -q -O $2 $1 &>> $logFile \ + && sudo dpkg -i $2 &>> $logFile + sudo apt-get install -fy &>> $logFile + ret_code=$? + retCode $ret_code + if [ "$3" == "yes" ]; then + pressKey + fi +} + +# +# install package from repositories +# input : package manager, package name +# package manager available : apt, pip, npm, gem, snap +# TODO: add apm, flatpak, umake?, use yarn instead of npm ? +# +function installPackage () { + typeset pkg="$2" + typeset ret_code + + case $1 in + "apt") + printf "[APT] Installing $pkg " + printf "\n[APT] installing $pkg\n" &>> $logFile + sudo apt-get install -fy $pkg &>> $logFile + ret_code=$? + retCode $ret_code + ;; + "pip") + if which pip3 >/dev/null; then + printf "[PIP] Installing $pkg " + printf "\n[PIP] installing $pkg\n" &>> $logFile + sudo -H pip3 install --upgrade $pkg &>> $logFile + ret_code=$? + retCode $ret_code + fi + ;; + "npm") + if which npm >/dev/null; then + printf "[NPM] Installing $pkg " + printf "\n[NPM] installing $pkg\n" &>> $logFile + sudo npm install -g $pkg &>> $logFile + ret_code=$? + retCode $ret_code + fi + ;; + "gem") + if which gem >/dev/null; then + printf "[GEM] Installing $pkg " + printf "\n[GEM] installing $pkg\n" &>> $logFile + sudo gem install $pkg &>> $logFile + ret_code=$? + retCode $ret_code + fi + ;; + "snap") + if which snap >/dev/null; then + printf "[SNAP] Installing $pkg " + printf "\n[SNAP] installing $pkg\n" &>> $logFile + sudo snap install $pkg --classic &>> $logFile + ret_code=$? + retCode $ret_code + fi + ;; + esac +} + +# +# check dependency and install it if necessary +# input : package manager, package name, cmd/bin to check +# +function checkAndInstallDep () { + if ! which $3 >/dev/null; then + printf "[DEP] dependency $2 not found [ "$BOLDROUGE"!!"$NORMAL" ]\n" + printf "[DEP] dependency $2 not found\n" &>> $logFile + case $1 in + "apt") + installPackage apt $2 + ;; + "npm") + installPackage npm $2 + ;; + "pip") + installPackage pip $2 + ;; + "gem") + installPackage gem $2 + ;; + "snap") + installPackage snap $2 + ;; + esac + fi +} + +# +# add specific repository for a given package +# input : unique ID, apt cache update yes/no +# +function addSpecificRepoFct () { + for i in $AppsRepo; do + appRepo=(${i//;/ }) + if [ "${appRepo[0]}" == "$1" ]; then + printf "[ADD] package -- $1 -- repo/ppa " + printf "added by function -- ${appRepo[1]}\n" + eval "${appRepo[1]}" + repoAdded=$(($repoAdded+1)) + fi + done + if [ "$2" == "yes" ]; then + updateSystem + fi + unset i + unset appRepo +} + +# +# find and execute Pre/Post install functions for a specific app +# input : unique ID +# +function processAppTrtFct () { + for i in $AppsTrtFct; do + appTrtFct=(${i//;/ }) + if [ "${appTrtFct[0]}" == "$1" ]; then + printf "[TRT] package -- $1 -- " + printf "post install processed by -- ${appTrtFct[1]}\n" + eval "${appTrtFct[1]}" + fi + done +} + +# +# install all about a specific category from Apps array app list (headless) +# input : category name +# +function installAppsFromList () { + msg "Installing apps from $1 category" + for i in $Apps; do + app=(${i//;/ }) + if [ "${app[2]}" == "$1" ]; then + addSpecificRepoFct ${app[3]} + fi + done + unset i + unset app + if [ "$repoAdded" -gt "0" ]; then + updateSystem + fi + for i in $Apps; do + app=(${i//;/ }) + if [ "${app[2]}" == "$1" ]; then + installPackage ${app[1]} ${app[0]} + processAppTrtFct ${app[3]} + fi + done +} + +# +# generate install apps menu about a specific category from Apps array app list (Menu) +# input : category name +# +function installAppsFromListMenu () { + for i in $Apps; do + app=(${i//;/ }) + if [ "${app[2]}" == "$1" ]; then + list+=("${app[3]}" "${app[3]}" "ON") + fi + done + + pkg=$(whiptail \ + --title "Yggdrasil $version - App Install ($1)" \ + --checklist \ + "Select app to install and press OK" 25 80 19 \ + "${list[@]}" 3>&1 1>&2 2>&3) + + exitstatus=$? + if [ $exitstatus = 0 ]; then + for pkgToInstall in $pkg; do + for i in $Apps; do + app=(${i//;/ }) + if [ "${app[3]}" == "${pkgToInstall//\"}" ]; then + addSpecificRepoFct ${app[3]} + fi + done + done + unset i + unset app + unset pkgToInstall + if [ "$repoAdded" -gt "0" ]; then + updateSystem + fi + for pkgToInstall in $pkg; do + for i in $Apps; do + app=(${i//;/ }) + if [ "${app[3]}" == "${pkgToInstall//\"}" ]; then + installPackage ${app[1]} ${app[0]} + processAppTrtFct ${app[3]} + fi + done + done + fi + unset list + pressKey +} + +# +# create app shortcut +# inputs : bin to exec, icon path, category, name, local/global, start w/ session +# +function createAppShortcut () { + typeset ret_code + + shortcut='[Desktop Entry]\n' + shortcut+='Encoding=UTF-8\n' + shortcut+='Terminal=0\n' + shortcut+='Exec='$1'\n' + shortcut+='Icon='$2'\n' + shortcut+='Type=Application\n' + if [ "$6" == "start" ]; then + shortcut+='X-MATE-Autostart-enabled=true\n\n' + else + shortcut+='Categories='$3';\n' + fi + shortcut+='StartupNotify=true\n' + shortcut+='Name='$4'\n' + shortcut+='GenericName='$4'\n' + shortcut+='Comment=' + + if [ "$5" == "global" ]; then + smsg "creating shortcut for $4 " + echo -e $shortcut > /usr/share/applications/"$4".desktop + ret_code=$? + retCode $ret_code + else + mkdir -p /home/$myHomedir/.local/share/applications + smsg "creating shortcut for $4 " + echo -e $shortcut > /home/"$myHomedir"/.local/share/applications/"$4".desktop + ret_code=$? + retCode $ret_code + fi +} + +# +# show Yggdrasil logo +# +function dispLogo () { + printf "\n" + printf $BOLDJAUNE + printf "██╗ ██╗ ██████╗ ██████╗ ██████╗ ██████╗ █████╗ ███████╗██╗██╗ \n" + printf "╚██╗ ██╔╝██╔════╝ ██╔════╝ ██╔══██╗██╔══██╗██╔══██╗██╔════╝██║██║ \n" + printf " ╚████╔╝ ██║ ███╗██║ ███╗██║ ██║██████╔╝███████║███████╗██║██║ \n" + printf " ╚██╔╝ ██║ ██║██║ ██║██║ ██║██╔══██╗██╔══██║╚════██║██║██║ \n" + printf " ██║ ╚██████╔╝╚██████╔╝██████╔╝██║ ██║██║ ██║███████║██║███████╗\n" + printf " ╚═╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝╚═╝╚══════╝\n" + printf "$BOLDROUGE Customize Linux Mint & Ubuntu derivatives made easier\n" + printf "$BOLDBLANC ver "$version" - GPLv3 - Francois B. (Makotosan) - makotonoblog.be\n" + printf "\n" +} + +# +# show usage for headless mode +# +function usage () { + dispLogo + dispSysInfos + printf "\n" + printf $NORMAL + printf "Usage : yggdrasil [options]\n\n" + printf " "$BOLDVERT"-f"$NORMAL" : install everything (see man pages for more details)(a+c+d+q)\n" + printf " "$BOLDVERT"-a"$NORMAL" : install all apps\n" + printf " "$BOLDVERT"-c"$NORMAL" : install Themes and Icons\n" + printf " "$BOLDVERT"-w"$NORMAL" : install Nitrogen + remove desktop management from caja\n" + printf " "$BOLDVERT"-d"$NORMAL" : install DNS Cache Unbound\n" + printf " "$BOLDVERT"-q"$NORMAL" : install cardreader apps\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"-n"$NORMAL" : install lastest Nvidia graphic drivers\n" + printf " "$BOLDVERT"-g"$NORMAL" : install lastest free graphic drivers (nouveau, amdgpu, ati, intel), mesa, ...\n" + printf " "$BOLDVERT"-k"$NORMAL" : update system to the latest kernel\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" + printf " "$BOLDVERT"-h"$NORMAL" : show help & informations\n" + printf "\n" +} + +function dispSysInfos () { + # CPU Architecture + printf $BOLDVERT"Architecture : "$NORMAL + uname -m + + # Current user homedir + printf $BOLDVERT"User (userdir) :"$NORMAL" $myHomedir\n" + + # Linux Distro Name + printf $BOLDVERT"OS : "$NORMAL + lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}' + + # Kernel version + printf $BOLDVERT"Kernel : "$NORMAL + uname -r + + # Desktop Name + printf $BOLDVERT"Desktop : "$NORMAL + case $XDG_CURRENT_DESKTOP in + "ENLIGHTENMENT") + printf "Enlightenment" + printf "\n" + ;; + "GNOME") + printf "Gnome" + printf "\n" + ;; + "KDE") + printf "KDE" + printf "\n" + ;; + "LXDE") + printf "LXDE" + printf "\n" + ;; + "MATE") + printf "Mate" + printf "\n" + ;; + "XFCE") + printf "XFCE" + printf "\n" + ;; + "X-Cinnamon") + printf "Cinnamon" + printf "\n" + ;; + "Unity") + printf "Unity" + printf "\n" + ;; + esac + + # Screen Resolution + printf $BOLDVERT"Screen resolution : "$NORMAL + xdpyinfo | sed -n 's/.*dim.* \([0-9]*x[0-9]*\) .*/\1/pg' | tr '\n' ' ' + printf "\n" + + # Type of Shell + printf $BOLDVERT"Shell : "$NORMAL + shellType=$(ps -p $PPID -o cmd --no-heading) + shellType=${shellType/-} + shellType=${shellType//*\/} + printf $shellType"\n" +} diff --git a/install_functions.sh b/install_functions_ub1604.sh similarity index 100% rename from install_functions.sh rename to install_functions_ub1604.sh diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh new file mode 100644 index 0000000..e4abfd5 --- /dev/null +++ b/install_functions_ub1804.sh @@ -0,0 +1,900 @@ +#------------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#------------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# install functions # +#-----------------------------------------------------------------------------# + +# +# install Base Apps (headless) +# +function installBase () { + installAppsFromList base +} + +# +# install Base Apps (Menu) +# +function installBaseMenu () { + installAppsFromListMenu base +} + +# +# install Office Apps (headless) +# +function installOffice () { + installAppsFromList office +} + +# +# install Office Apps (Menu) +# +function installOfficeMenu () { + installAppsFromListMenu office +} + +# +# install Multimedia Apps (headless) +# +function installMultimedia () { + installAppsFromList multimedia +} + +# +# install Multimedia Apps (Menu) +# +function installMultimediaMenu () { + installAppsFromListMenu multimedia +} + +# +# install eBook Apps (headless) +# +function installEbook () { + installAppsFromList ebook +} + +# +# install eBook Apps (Menu) +# +function installEbookMenu () { + installAppsFromListMenu ebook +} + +# +# install Internet Apps (headless) +# +function installInternet () { + runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \ + "setting as do not add repo" + installAppsFromList internet +} + +# +# install Internet Apps (Menu) +# +function installInternetMenu () { + runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \ + "setting as do not add repo" + installAppsFromListMenu internet +} + +# +# Viber (headless) +# +function installViber () { + installPackageDpkg http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb \ + viber.deb \ + no +} + +# +# Viber (Menu) +# +function installViberMenu () { + installPackageDpkg http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb \ + viber.deb \ + yes +} + +# +# Franz (headless) +# +function installFranz () { + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.17/franz_5.0.0-beta.17_amd64.deb \ + franz.deb \ + no +} + +# +# Franz (Menu) +# +function installFranzMenu () { + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.17/franz_5.0.0-beta.17_amd64.deb \ + franz.deb \ + yes +} + +# +# install Misc Utilities Apps (headless) +# +function installMiscUtilities () { + installAppsFromList utilities +} + +# +# install Misc Utilities Apps (Menu) +# +function installMiscUtilitiesMenu () { + installAppsFromListMenu utilities +} + +# +# install Wine Build (headless) +# +function installWine () { + installAppsFromList wine +} + +# +# install Wine Build (Menu) +# +function installWineMenu () { + installAppsFromListMenu wine +} + +# +# install Game Apps (headless) +# +function installGames () { + installAppsFromList games +} + +# +# install Game Apps (Menu) +# +function installGamesMenu () { + installAppsFromListMenu games +} + +# +# Steam (headless) +# +function installSteam () { + runCmd "echo steam steam/purge \"note\" | sudo debconf-set-selections \"accepting steam licence\"" + runCmd "echo steam steam/license \"note\" | sudo debconf-set-selections \"accepting steam licence 2/3\"" + runCmd "echo steam steam/question select \"I AGREE\" | sudo debconf-set-selections \"accepting steam licence 3/3\"" + installPackage apt steam +} + +# +# Steam (Menu) +# +function installSteamMenu () { + installPackage apt steam +} + +# +# install Burning Apps (headless) +# +function installBurningTools () { + installAppsFromList burningtools +} + +# +# install Burning Apps (Menu) +# +function installBurningToolsMenu () { + installAppsFromListMenu burningtools +} + +# +# install Network Apps (headless) +# +function installNetTools () { + runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \ + "setting Wireshark as root only" + installAppsFromList nettools +} + +# +# install Network Apps (Menu) +# +function installNetToolsMenu () { + runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \ + "setting Wireshark as root only" + installAppsFromListMenu nettools +} + +# +# install Caja Plugins (headless) +# +function installCajaPlugins () { + installAppsFromList cajaplugins +} + +# +# install Caja Plugins (Menu) +# +function installCajaPluginsMenu () { + installAppsFromListMenu cajaplugins +} + +# +# install Nautilus Apps + plugins (headless) +# +function installNautilusAndPlugins () { + installAppsFromList nautilus +} + +# +# install Nautilus Apps + plugins (Menu) +# +function installNautilusAndPluginsMenu () { + installAppsFromListMenu nautilus +} + +# +# install Gimp plugins (headless) +# +function installGimpPlugins () { + installAppsFromList gimp +} + +# +# install Gimp plugins (Menu) +# +function installGimpPluginsMenu () { + installAppsFromListMenu gimp +} + +# +# install RhythmBox plugins (headless) +# +function installRhythmBoxPlugins () { + installAppsFromList rhythmbox +} + +# +# install RhythmBox plugins (Menu) +# +function installRhythmBoxPluginsMenu () { + installAppsFromListMenu rhythmbox +} + +# +# install Pidgin plugins (headless) +# +function installPidginPlugins () { + installAppsFromList pidgin +} + +# +# install Pidgin plugins (Menu) +# +function installPidginPluginsMenu () { + installAppsFromListMenu pidgin +} + +# +# install Nitrogen app (headless) +# +function installNitrogen () { + installAppsFromList nitrogen +} + +# +# install Nitrogen app (Menu) +# +function installNitrogenMenu () { + installAppsFromListMenu nitrogen +} + +# +# install Beta Apps (headless) +# +function installBeta () { + installAppsFromList beta +} + +# +# install Beta Apps (Menu) +# +function installBetaMenu () { + installAppsFromListMenu beta +} + +# +# install Nightly Apps (headless) +# +function installNightly () { + installAppsFromList nightly +} + +# +# install Nightly Apps (Menu) +# +function installNightlyMenu () { + installAppsFromListMenu nightly +} + +# +# install GTK Themes (headless) +# +function installThemes () { + installAppsFromList gtkthemes +} + +# +# install GTK Themes (Menu) +# +function installThemesMenu () { + installAppsFromListMenu gtkthemes +} + +# +# install Icon Themes (headless) +# +function installIcons () { + installAppsFromList icons +} + +# +# install Icon Themes (Menu) +# +function installIconsMenu () { + installAppsFromListMenu icons +} + +# +# install Solaar App (headless) +# +function installSolaar () { + installAppsFromList solaar +} + +# +# install Solaar App (Menu) +# +function installSolaarMenu () { + installAppsFromListMenu solaar +} + +# +# install CardReader Apps (headless) +# +function installCardReader () { + installAppsFromList cardreader +} + +# +# install CardReader Apps (Menu) +# +function installCardReaderMenu () { + installAppsFromListMenu cardreader +} + +# +# update AMD/Intel CPU Microcode +# +function updateMicrocode () { + msg "CPU Microcode updating" + oldMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` + intel=`cat /proc/cpuinfo | grep -i Intel | wc -l` + amd=`cat /proc/cpuinfo | grep -i Amd | wc -l` + if [ "$intel" -gt "0" ]; then + printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" + installPackage apt intel-microcode + elif [ "$amd" -gt "0" ]; then + installPackage apt amd64-microcode + printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" + else + printf "[INFO] No Intel/AMD CPU found" + fi + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` + printf "\n" +} + +# +# fix some config issue with Intel Wireless 6320 cards +# +function fixWirelessIntel6320 () { + runCmd "sudo cp /etc/modprobe.d/iwlwifi.conf /etc/modprobe.d/iwlwifi.conf.bak" \ + "backing up config file" + runCmd "echo options iwlwifi bt_coex_active=0 swcrypto=1 11n_disable=8 | sudo tee /etc/modprobe.d/iwlwifi.conf" \ + "applying new config" + printf "[INFO] reboot required !!!" + printf "\n" +} + +# +# install Webcam Apps (headless) +# +function installWebcam () { + installAppsFromList webcam +} + +# +# install Webcam Apps (Menu) +# +function installWebcamMenu () { + installAppsFromListMenu webcam +} + +# +# install latest versions of graphic drivers, mesa, .... (headless) +# +function installOibaf () { + addRepo_Oibaf +} + +# +# install latest versions of graphic drivers, mesa, .... (Menu) +# +function installOibafMenu () { + addRepo_Oibaf +} + +# +# install Nvidia Drivers (headless) +# +function installNvidia370 () { + installAppsFromList nvidia-370 +} + +# +# install Nvidia Drivers (Menu) +# +function installNvidia370Menu () { + installAppsFromListMenu nvidia-370 +} + +# +# install Nvidia Drivers (headless) +# +function installNvidia375 () { + installAppsFromList nvidia-375 +} + +# +# install Nvidia Drivers (Menu) +# +function installNvidia375Menu () { + installAppsFromListMenu nvidia-375 +} + +# +# install Nvidia Drivers (headless) +# +function installNvidia378 () { + installAppsFromList nvidia-378 +} + +# +# install Nvidia Drivers (Menu) +# +function installNvidia378Menu () { + installAppsFromListMenu nvidia-378 +} + +# +# install Nvidia Drivers (headless) +# +function installNvidia381 () { + installAppsFromList nvidia-381 +} + +# +# install Nvidia Drivers (Menu) +# +function installNvidia381Menu () { + installAppsFromListMenu nvidia-381 +} + +# +# install Nvidia Drivers (headless) +# +function installNvidia384 () { + installAppsFromList nvidia-384 +} + +# +# install Nvidia Drivers (Menu) +# +function installNvidia384Menu () { + installAppsFromListMenu nvidia-384 +} + +# +# install Nvidia Drivers (headless) +# +function installNvidia387 () { + installAppsFromList nvidia-387 +} + +# +# install Nvidia Drivers (Menu) +# +function installNvidia387Menu () { + installAppsFromListMenu nvidia-387 +} + +# +# install Nvidia Drivers (headless) +# +function installNvidia390 () { + installAppsFromList nvidia-390 +} + +# +# install Nvidia Drivers (Menu) +# +function installNvidia390Menu () { + installAppsFromListMenu nvidia-390 +} + +# +# install Nvidia Drivers (headless) +# +function installNvidia396 () { + installAppsFromList nvidia-396 +} + +# +# install Nvidia Drivers (Menu) +# +function installNvidia396Menu () { + installAppsFromListMenu nvidia-396 +} + +# +# install TLP App (headless) +# +function installTLP () { + installAppsFromList tlp +} + +# +# install TLP App (Menu) +# +function installTLPMenu () { + installAppsFromListMenu tlp +} + +#TODO: +function installKeyIDuDev () { + sudo sh -c "echo '# this udev file should be used with udev 188 and newer\n\ +ACTION!=\"add|change\", GOTO=\"u2f_end\"\n\ +\n\ +# Key-ID FIDO U2F\n\ +KERNEL==\"hidraw*\", SUBSYSTEM==\"hidraw\", ATTRS{idVendor}==\"096e\", ATTRS{idProduct}==\"0850|0880\", TAG+=\"uaccess\"\n\ +\n\ +LABEL=\"u2f_end\"' > /etc/udev/rules.d/70-u2f.rules" + + runCmd "sudo service udev restart" \ + "restarting UDEV service" +} + +# +# install Dev Apps (headless) +# +function installDevApps () { + installAppsFromList dev +} + +# +# install Dev Apps (Menu) +# +function installDevAppsMenu () { + installAppsFromListMenu dev +} + + +# +# install Javascript env (headless) +# +function installJavascript () { + installAppsFromList javascript +} + +# +# install Javascript env (Menu) +# +function installJavascriptMenu () { + installAppsFromListMenu javascript +} + +# +# install JAVA 10 (headless) +# +function installJava10 () { + runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ + "accepting Oracle Java SE 10 licence agreement" + installAppsFromList java10 +} + +# +# install JAVA 10 (Menu) +# +function installJava10Menu () { + runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ + "accepting Oracle Java SE 10 licence agreement" + installAppsFromListMenu java10 +} + +# +# install Mongo DB 3 CE (headless) +# +function installMongo3CE () { + installAppsFromList mongodb +} + +# +# install Mongo DB 3 CE (Menu) +# +function installMongo3CEMenu () { + installAppsFromListMenu mongodb +} + +# +# install Python Apps (headless) +# +function installPython () { + installAppsFromList python +} + +# +# install Python Apps (Menu) +# +function installPythonMenu () { + installAppsFromListMenu python +} + +# +# install PHP Apps (headless) +# +function installPHP () { + installAppsFromList php +} + +# +# install PHP Apps (Menu) +# +function installPHPMenu () { + installAppsFromListMenu php +} + +# +# install QT Apps/tools (headless) +# +function installQT () { + installAppsFromList qt +} + +# +# install QT Apps/tools (Menu) +# +function installQTMenu () { + installAppsFromListMenu qt +} + +# +# install LUA Apps (headless) +# +function installLUA () { + installAppsFromList lua +} + +# +# install LUA Apps (Menu) +# +function installLUAMenu () { + installAppsFromListMenu lua +} + +# +# install Ruby Apps (headless) +# +function installRuby () { + installAppsFromList ruby +} + +# +# install Ruby Apps (Menu) +# +function installRubyMenu () { + installAppsFromListMenu ruby +} + +#TODO: +function installAndroidEnv () { + msg="Installing Android environment" + + runCmd "touch /home/$myHomedir/.bashrc" \ + "creating .bashrc file if necessary" + sh -c "echo '\n\nexport PATH=${PATH}:/home/'$myHomedir'/Android/Sdk/tools:/home/'$myHomedir'/Android/Sdk/platform-tools' >> /home/$myHomedir/.bashrc" +} + +# +# install Atom App (headless) +# +function installAtom () { + installAppsFromList atom +} + +# +# install Atom App (menu) +# +function installAtomMenu () { + installAppsFromListMenu atom +} + +# +# install Anjuta Apps (headless) +# +function installAnjuta () { + installAppsFromList anjuta +} + +# +# install Anjuta Apps (Menu) +# +function installAnjutaMenu () { + installAppsFromListMenu anjuta +} + +# +# install Brackets Apps (headless) +# +function installBrackets () { + installAppsFromList brackets +} + +# +# install Brackets Apps (Menu) +# +function installBracketsMenu () { + installAppsFromListMenu brackets +} + +# +# install CodeBlocks Apps (headless) +# +function installCodeBlocks () { + installAppsFromList codeblocks +} + +# +# install CodeBlocks Apps (Menu) +# +function installCodeBlocksMenu () { + installAppsFromListMenu codeblocks +} + +# +# install Geany Apps (headless) +# +function installGeany () { + installAppsFromList geany +} + +# +# install Geany Apps (Menu) +# +function installGeanyMenu () { + installAppsFromListMenu geany +} + +# +# install IDEA Apps (headless) +# +function installIdea () { + installAppsFromList idea +} + +# +# install IDEA Apps (Menu) +# +function installIdeaMenu () { + installAppsFromListMenu idea +} + +# +# install Pycharm Apps (headless) +# +function installPyCharm () { + installAppsFromList pycharm +} + +# +# install Pycharm Apps (Menu) +# +function installPyCharmMenu () { + installAppsFromListMenu pycharm +} + +# +# install Visual Studio Code Apps (headless) +# +function installVisualStudioCode () { + installAppsFromList code +} + +# +# install Visual Studio Code Apps (Menu) +# +function installVisualStudioCodeMenu () { + installAppsFromListMenu code +} + +# +# install Android-Studio Apps (headless) +# +function installAndroidStudio () { + installAppsFromList androidstudio +} + +# +# install Android-Studio Apps (Menu) +# +function installAndroidStudioMenu () { + installAppsFromListMenu androidstudio +} + +# +# install SublimeText Apps (headless) +# +function installSublimeText() { + installAppsFromList sublime-text +} + +# +# install SublimeText Apps (Menu) +# +function installSublimeTextMenu() { + installAppsFromListMenu sublime-text +} + +# +# install CAD Apps (headless) +# +function installCAD () { + installAppsFromList cad +} + +# +# install CAD Apps (Menu) +# +function installCADMenu () { + installAppsFromListMenu cad +} + +# +# install Teamviewer 13 (headless) +# +function installTeamViewer13 () { + installPackageDpkg https://download.teamviewer.com/download/linux/teamviewer_amd64.deb \ + teamviewer13.deb \ + no +} + +# +# install Teamviewer 13 (Menu) +# +function installTeamViewer13Menu () { + installPackageDpkg https://download.teamviewer.com/download/linux/teamviewer_amd64.deb \ + teamviewer13.deb \ + yes +} + +# +# install/enable Unboud (headless) +# +function installUnbound () { + installAppsFromList unbound +} diff --git a/menus_functions.sh b/menus_functions_ub1604.sh similarity index 100% rename from menus_functions.sh rename to menus_functions_ub1604.sh diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh new file mode 100644 index 0000000..3eb1ec2 --- /dev/null +++ b/menus_functions_ub1804.sh @@ -0,0 +1,475 @@ +#------------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#------------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# menus functions # +#-----------------------------------------------------------------------------# + +# +# show about dialog box +# +function showAboutBoxMenu () { +whiptail \ +--title "About" \ +--msgbox "\n + Author : Francois B. (Makotosan) + Email : shakasan@sirenacorp.be +Website : https://makotonoblog.be/ + Github : https://github.com/shakasan/yggdrasil_ng +Licence : GPLv3 +Version : $version\n +At the beginning, this script has been written to makes my life easier when I have to (re)install my personal computers ;-) +Advices and remarks are welcome ^^" \ +20 80 +} + +# +# show reboot menu +# +function showRebootBoxMenu () { + if (whiptail \ + --title "Yggdrasil $version - WARNING - ReBoot" \ + --yesno "Are you sure to reboot this computer ?" \ + 7 42) then + sudo reboot + fi +} + +# +# show menu to config system +# +function showConfigMenu () { + while true; do + + configMenuOptions=$(whiptail \ + --title "Yggdrasil $version - System Config" \ + --menu "System Config" \ + 25 80 16 \ + "Ufw" "Enable Firewall (ufw)" \ + "NumLockX" "NumLock Enabled at boot time" \ + "TmpRAM" "/tmp stored in RAM" \ + "screenfetch" "screenfetch added to .bashrc" \ + "historyTS" "TimeStamp enabled in Shell History" \ + "unattendedUpgrades" "Enable automatic security updates" \ + "Unbound" "Enable Unbound DNS Cache server" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $configMenuOptions in + "Ufw") + clear + enableUFW + pressKey + ;; + "NumLockX") + clear + enableNumLockX + pressKey + ;; + "TmpRAM") + clear + enableTmpRAM + pressKey + ;; + "screenfetch") + clear + addScreenfetchBashrc + pressKey + ;; + "historyTS") + clear + enableHistoryTS + pressKey + ;; + "unattendedUpgrades") + clear + installUnattendedUpgrades + pressKey + ;; + "Unbound") + clear + installUnbound + pressKey + ;; + "Back") + break + ;; + esac + + done +} + +# +# show menu to install system tools +# +function showSysToolsMenu () { + while true; do + + sysToolsMenuOptions=$(whiptail \ + --title "Yggdrasil $version - System Tools" \ + --menu "System tools to diagnose and optimize" \ + 25 80 16 \ + "inxi" "System informations" \ + "speedtest-cli" "Bandwidth test" \ + "packetloss" "Packetloss test (ping)" \ + "OptimizeFirefox" "Firefox SQLite databases optimization" \ + "Autoremove" "Remove useless Deb packages" \ + "CleanOldKernels" "Removing old kernels (keep 2 last kernels)" \ + "SoundCardsDetection" "Sound Cards Detection" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $sysToolsMenuOptions in + "inxi") + clear; toolInxi; pressKey + ;; + "speedtest-cli") + clear; toolSpeedtestCli; pressKey + ;; + "packetloss") + clear; toolPacketLoss; pressKey + ;; + "OptimizeFirefox") + clear; toolOptimizeFirefox; pressKey + ;; + "Autoremove") + clear; toolAutoremove; pressKey + ;; + "CleanOldKernels") + clear; toolClearOldKernels; pressKey + ;; + "SoundCardsDetection") + clear; toolSoundCardsDetection; pressKey + ;; + "Back") + break + ;; + esac + + done +} + +# +# show menu to install themes/icons +# +function showThemesInstallMenu () { + while true; do + + themesInstallMenuOptions=$(whiptail \ + --title "Yggdrasil $version - Themes/Icons Install" \ + --menu "Install themes/icons from different submenus" \ + 25 80 16 \ + "themes" "GTK themes" \ + "icons" "Icons" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $themesInstallMenuOptions in + "themes") + installThemesMenu + ;; + "icons") + installIconsMenu + ;; + "Back") + break + ;; + esac + + done +} + +# +# show menu to install dev apps +# +function showDevInstallMenu () { + while true; do + + devInstallMenuOptions=$(whiptail \ + --title "Yggdrasil $version - Dev Install" \ + --menu "Install Dev apps from different submenus" \ + 25 80 16 \ + "devbase" "dev apps and tools" \ + "java10" "Java 10 dev env" \ + "javascript" "JavaScript dev env" \ + "mongodb3ce" "MongoDB 3 CE" \ + "php" "PHP dev env" \ + "lua" "Lua dev env" \ + "ruby" "Ruby dev env" \ + "qt" "QT dev env" \ + "python" "Python dev env" \ + "atom" "Atom" \ + "anjuta" "Anjuta" \ + "brackets" "Brackets" \ + "codeblocks" "CodeBlocks" \ + "geany" "Geany" \ + "idea" "Idea" \ + "pycharm" "PyCharm" \ + "vsc" "Visual Studio Code" \ + "androidstudio" "Android Studio" \ + "sublimetext" "Sublime Text" \ + "cad" "CAD tools" \ + "teamviewer13" "Teamviewer 13" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $devInstallMenuOptions in + "devbase") + installDevAppsMenu + ;; + "java10") + installJava10 + ;; + "javascript") + installJavascriptMenu + ;; + "mongodb3ce") + installMongo3CEMenu + ;; + "php") + installPHPMenu + ;; + "lua") + installLUAMenu + ;; + "ruby") + installRubyMenu + ;; + "qt") + installQTMenu + ;; + "python") + installPythonMenu + ;; + "atom") + installAtomMenu + ;; + "anjuta") + installAnjutaMenu + ;; + "brackets") + installBracketsMenu + ;; + "codeblocks") + installCodeBlocksMenu + ;; + "geany") + installGeanyMenu + ;; + "idea") + installIdeaMenu + ;; + "pycharm") + installPyCharmMenu + ;; + "vsc") + installVisualStudioCodeMenu + ;; + "androidstudio") + installAndroidStudioMenu + ;; + "sublimetext") + installSublimeTextMenu + ;; + "cad") + installCADMenu + ;; + "teamviewer13") + installTeamViewer13Menu + ;; + "Back") + break + ;; + esac + + done +} + +# +# show menu to install apps from different categories +# +function showAppInstallMenu () { + while true; do + + appsInstallMenuOptions=$(whiptail \ + --title "Yggdrasil $version - Apps Install" \ + --menu "Install apps from different submenus" \ + 25 80 16 \ + "base" "Base Apps" \ + "office" "Office Apps" \ + "multimedia" "Multimedia Apps" \ + "internet" "Internet Apps" \ + "utilities" "Misc Utilities" \ + "games" "Games & tools" \ + "steam" "Steam" \ + "burningtools" "Disc Burning and tools" \ + "nettools" "Network tools" \ + "cajaplugins" "Caja Plugins" \ + "nautilus" "Nautilus and plugins" \ + "gimp" "Gimp plugins" \ + "rhythmbox" "RhythmBox plugins" \ + "pidgin" "Pidgin plugins" \ + "nitrogen" "Nitrogen WP Manager" \ + "wine" "Wine Builds" \ + "viber" "Viber IM desktop app" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $appsInstallMenuOptions in + "base") + installBaseMenu + ;; + "office") + installOfficeMenu + ;; + "multimedia") + installMultimediaMenu + ;; + "internet") + installInternetMenu + ;; + "utilities") + installMiscUtilitiesMenu + ;; + "games") + installGamesMenu + ;; + "steam") + installSteamMenu + ;; + "burningtools") + installBurningToolsMenu + ;; + "nettools") + installNetToolsMenu + ;; + "cajaplugins") + installCajaPluginsMenu + ;; + "nautilus") + installNautilusAndPluginsMenu + ;; + "gimp") + installGimpPluginsMenu + ;; + "rhythmbox") + installRhythmBoxPluginsMenu + ;; + "pidgin") + installPidginPluginsMenu + ;; + "nitrogen") + installNitrogenMenu + ;; + "wine") + installWineMenu + ;; + "viber") + installViberMenu + ;; + "Back") + break + ;; + esac + + done +} + +# +# show menu to install beta apps from different categories +# +function showAppBetaInstallMenu () { + installBetaMenu +} + +# +# show menu to install nightly apps from different categories +# +function showAppNightlyInstallMenu () { + installNightlyMenu +} + +# +# show menu about install/config hardware +# +function showHardwareMenu () { + while true; do + + hardwareMenuOptions=$(whiptail \ + --title "Yggdrasil $version - System Tools" \ + --menu "System tools to diagnose and optimize" \ + 25 80 16 \ + "cardreader" "Apps/tools needed for cardreaders" \ + "solaar" "Solaar for Logitech Unifying devices" \ + "webcam" "Install webcam neede apps" \ + "microcode" "Update Intel/AMD CPU microcode" \ + "oibaf" "latest version of free graphic drivers, mesa, ..." \ + "nvidia370" "Install Nvidia 370 graphic drivers" \ + "nvidia375" "Install Nvidia 375 graphic drivers" \ + "nvidia378" "Install Nvidia 378 graphic drivers" \ + "nvidia381" "Install Nvidia 381 graphic drivers" \ + "nvidia384" "Install Nvidia 384 graphic drivers" \ + "nvidia387" "Install Nvidia 387 graphic drivers" \ + "nvidia390" "Install Nvidia 390 graphic drivers" \ + "nvidia396" "Install Nvidia 396 graphic drivers" \ + "tlp" "Install/Enable TLP for better power management " \ + "keyid" "Add udev rules for Key-ID FIDO U2F usb key" \ + "WI6320" "Fix Intel Wireless 6320 card config problem" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $hardwareMenuOptions in + "cardreader") + installCardReaderMenu + ;; + "solaar") + installAppsFromListMenu + ;; + "webcam") + installWebcamMenu + ;; + "microcode") + updateMicrocode + ;; + "oibaf") + installOibafMenu + ;; + "nvidia370") + installNvidia370Menu + ;; + "nvidia375") + installNvidia375Menu + ;; + "nvidia378") + installNvidia378Menu + ;; + "nvidia381") + installNvidia381Menu + ;; + "nvidia384") + installNvidia384Menu + ;; + "nvidia387") + installNvidia387Menu + ;; + "nvidia390") + installNvidia390Menu + ;; + "nvidia396") + installNvidia396Menu + ;; + "tlp") + installTLPMenu + ;; + "keyid") + installKeyIDuDev + ;; + "WI6320") + fixWirelessIntel6320 + ;; + "Back") + break + ;; + esac + + done +} \ No newline at end of file diff --git a/repo_functions.sh b/repo_functions_ub1604.sh similarity index 100% rename from repo_functions.sh rename to repo_functions_ub1604.sh diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh new file mode 100644 index 0000000..cfb15c8 --- /dev/null +++ b/repo_functions_ub1804.sh @@ -0,0 +1,1319 @@ +#------------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#------------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# list of apps with required package manager and category # +#-----------------------------------------------------------------------------# + +# +# List of packages available +# fields : package name, package manager, category, unique ID for external functions +# +Apps="cifs-utils;apt;base;cifs-utils +xterm;apt;base;xterm +curl;apt;base;curl +mc;apt;base;mc +bmon;apt;base;bmon +htop;apt;base;htop +screen;apt;base;screen +dconf-cli;apt;base;dconf +dconf-editor;apt;base;dconf-editor +lnav;apt;base;lnav +exfat-fuse;apt;base;exfat-fuse +exfat-utils;apt;base;exfat-utils +iftop;apt;base;iftop +iptraf;apt;base;iptraf +mpg123;apt;base;mpg123 +debconf-utils;apt;base;debconf-utils +idle3-tools;apt;base;idle3-tools +snapd;apt;base;snapd +sysstat;apt;base;sysstat +spotify;snap;multimedia;spotify +slowmovideo;apt;multimedia;slowmovideo +sayonara;apt;multimedia;sayonara +qmmp;apt;multimedia;qmmp +qmmp-plugin-projectm;apt;multimedia;qmmp-plugin-projectm +shotcut;apt;multimedia;shotcut +audacious;apt;multimedia;audacious +dia;apt;multimedia;dia +mpv;apt;multimedia;mpv +picard;apt;multimedia;picard +inkscape;apt;multimedia;inkscape +aegisub;apt;multimedia;aegisub +aegisub-l10n;apt;multimedia;aegisub-l10n +mypaint;apt;multimedia;mypaint +mypaint-data-extras;apt;multimedia;mypaint-data-extras +audacity;apt;multimedia;audacity +blender;apt;multimedia;blender +kodi;apt;multimedia;kodi +digikam;apt;multimedia;digikam +synfigstudio;apt;multimedia;synfigstudio +mkvtoolnix-gui;apt;multimedia;mkvtoolnix-gui +rawtherapee;apt;multimedia;rawtherapee +hugin;apt;multimedia;hugin +xnview;apt;multimedia;xnview +asunder;apt;multimedia;asunder +milkytracker;apt;multimedia;milkytracker +pitivi;apt;multimedia;pitivi +openshot;apt;multimedia;openshot +smplayer;apt;multimedia;smplayer +smplayer-themes;apt;multimedia;smplayer-themes +smplayer-l10n;apt;multimedia;smplayer-l10n +selene;apt;multimedia;selene +gnome-mplayer;apt;multimedia;gnome-mplayer +handbrake;apt;multimedia;handbrake +avidemux2.6-qt;apt;multimedia;avidemux2.6-qt +avidemux2.6-plugins-qt;apt;multimedia;avidemux2.6-plugins-qt +mjpegtools;apt;multimedia;mjpegtools +twolame;apt;multimedia;twolame +lame;apt;multimedia;lame +banshee;apt;multimedia;banshee +banshee-extension-soundmenu;apt;multimedia;banshee-extension-soundmenu +gpicview;apt;multimedia;gpicview +vlc;apt;multimedia;vlc +shotwell;apt;multimedia;shotwell +darktable;apt;multimedia;darktable +ffmpeg;apt;multimedia;ffmpeg +flacon;apt;multimedia;flacon +scribus;apt;multimedia;scribus +gnome-font-viewer;apt;multimedia;gnome-font-viewer +moc;apt;multimedia;moc +webp;apt;multimedia;webp +simplescreenrecorder;apt;multimedia;simplescreenrecorder +simplescreenrecorder-lib;apt;multimedia;simplescreenrecorder-lib +simplescreenrecorder-lib:i386;apt;multimedia;simplescreenrecorder-lib:i386 +cuetools;apt;multimedia;cuetools +shntool;apt;multimedia;shntool +flac;apt;multimedia;flac +entangle;apt;multimedia;entangle +krita;apt;multimedia;krita +soundconverter;apt;multimedia;soundconverter +gimp;apt;multimedia;gimp +vidcutter;apt;multimedia;vidcutter +green-recorder;apt;multimedia;green-recorder +radiotray;apt;multimedia;radiotray +quodlibet;apt;multimedia;quodlibet +python-cddb;apt;multimedia;python-cddb +python-musicbrainz2;apt;multimedia;python-musicbrainz2 +gmusicbrowser;apt;multimedia;gmusicbrowser +peek;apt;multimedia;peek +bino;apt;multimedia;bino +owncloud-client;apt;internet;owncloud-client +syncthing-gtk;apt;internet;syncthing-gtk +syncthing;apt;internet;syncthing +insync;apt;internet;insync +discord;snap;internet;discord +quiterss;apt;internet;quiterss +opera-stable;apt;internet;opera-stable +google-chrome-stable;apt;internet;google-chrome-stable +xchat-gnome;apt;internet;xchat-gnome +xchat-gnome-indicator;apt;internet;xchat-gnome-indicator +chromium-browser;apt;internet;chromium-browser +chromium-browser-l10n;apt;internet;chromium-browser-l10n +nautilus-dropbox;apt;internet;nautilus-dropbox +filezilla;apt;internet;filezilla +hexchat;apt;internet;hexchat +mumble;apt;internet;mumble +imagedownloader;apt;internet;imagedownloader +california;apt;internet;california +midori;apt;internet;midori +geary;apt;internet;geary +corebird;apt;internet;corebird +telegram;apt;internet;telegram +skypeforlinux;apt;internet;skypeforlinux +nextcloud-client;apt;internet;nextcloud-client +nextcloud-client-caja;apt;internet;nextcloud-client-caja +deluge-gtk;apt;internet;deluge-gtk +deluge-torrent;apt;internet;deluge-torrent +vivaldi-stable;apt;internet;vivaldi-stable +transmission-gtk;apt;internet;transmission-gtk +qtqr;apt;utilities;qtqr +gqrcode;apt;utilities;gqrcode +cpu-g;apt;utilities;cpu-g +screenfetch;apt;utilities;screenfetch +xcalib;apt;utilities;xcalib +conky-manager;apt;utilities;conky-manager +conky-all;apt;utilities;conky-all +plank;apt;utilities;plank +indicator-sound-switcher;apt;utilities;indicator-sound-switcher +y-ppa-manager;apt;utilities;y-ppa-manager +synapse;apt;utilities;synapse +acetoneiso;apt;utilities;acetoneiso +guake;apt;utilities;guake +tilda;apt;utilities;tilda +psensor;apt;utilities;psensor +kazam;apt;utilities;kazam +bleachbit;apt;utilities;bleachbit +gparted;apt;utilities;gparted +gsmartcontrol;apt;utilities;gsmartcontrol +terminator;apt;utilities;terminator +aptik;apt;utilities;aptik +gufw;apt;utilities;gufw +numlockx;apt;utilities;numlockx +grub-customizer;apt;utilities;grub-customizer +unetbootin;apt;utilities;unebootin +zim;apt;utilities;zim +diodon;apt;utilities;diodon +pyrenamer;apt;utilities;pyrenamer +qt5ct;apt;utilities;qt5ct +qt4-qtconfig;apt;utilities;qt4-qtconfig +byobu;apt;utilities;byobu +mupdf;apt;utilities;mupdf +mupdf-tools;apt;utilities;mupdf-tools +ukuu;apt;utilities;ukuu +fcrackzip;apt;utilities;fcrackzip +rarcrack;apt;utilities;rarcrack +pdfcrack;apt;utilities;pdfcrack +figlet;apt;utilities;figlet +alltray;apt;utilities;alltray +cheat;pip;utilities;cheat +mate-sensors-applet-nvidia;apt;utilities;mate-sensors-applets-nvidia +woeusb;apt;utilities;woeusb +screenkey;apt;utilities;screenkey +tmsu;apt;utilities;tmsu +etcher-electron;apt;utilities;etcher-electron +pdfgrep;apt;utilities;pdfgrep +coinmon;npm;utilities;coinmon +tldr;pip;utilities;tldr +gyazo;apt;utilities;gyazo +fdupes;apt;utilities;fdupes +vulkan-utils;apt;utilities;vulkan-utils +python3-dev;apt;python;python3-dev +python3-pip;apt;python;python3-pip +python3-pyqt5;apt;python;python3-pyqt5 +pyqt5-dev-tools;apt;python;pyqt5-dev-tools +pip;pip;python;setuptools +setuptools;pip;python;setuptools +PyOpenGL;pip;python;PyOpenGL +tweepy;pip;python;tweepy +weppy;pip;python;weppy +py-term;pip;python;py-term +jstest-gtk;apt;games;jstest-gtk +dosbox;apt;games;dosbox +brasero;apt;burningtools;brasero +k3b;apt;burningtools;k3b +k3b-extrathemes;apt;burningtools;k3b-extrathemes +xfburn;apt;burningtools;xfburn +whois;apt;nettools;whois +iptraf;apt;nettools;iptraf +iperf;apt;nettools;iperf +wireshark;apt;nettools;wireshark +tshark;apt;nettools;tshark +zenmap;apt;nettools;zenmap +dsniff;apt;nettools;dsniff +aircrack-ng;apt;nettools;aricrack-ng +SpoofMAC;pip;nettools;SpoofMAC +speedtest-cli;pip;nettools;speedtest-cli +whatportis;pip;nettools;whatportis +nethogs;apt;nettools;nethogs +ssh_scan;gem;nettools;sshscan +caja-share;apt;cajaplugins;caja-share +caja-wallpaper;apt;cajaplugins;caja-wallpaper +caja-sendto;apt;cajaplugins;caka-sendto +caja-image-converter;apt;cajaplugins;caja-image-converter +insync-caja;apt;cajaplugins;insync-caja +nautilus;apt;nautilus;nautilus +file-roller;apt;nautilus;file-roller +nautilus-emblems;apt;nautilus;nautilus-emblems +nautilus-image-manipulator;apt;nautilus;nautilus-image-manipulator +nautilus-image-converter;apt;nautilus;nautilus-image-converter +nautilus-compare;apt;nautilus;nautilus-compare +nautilus-actions;apt;nautilus;nautilus-actions +nautilus-sendto;apt;nautilus;nautilus-sendto +nautilus-share;apt;nautilus;nautilus-share +nautilus-wipe;apt;nautilus;nautilus-wipe +nautilus-script-audio-convert;apt;nautilus;nautilus-script-audio-convert +nautilus-filename-repairer;apt;nautilus;filename-repairer +nautilus-gtkhash;apt;nautilus;nautilus-gtkhash +nautilus-ideviceinfo;apt;nautilus;nautilus-ideviceinfo +ooo-thumbnailer;apt;nautilus;ooo-thumbnailer +nautilus-dropbox;apt;nautilus;nautilus-dropbox +nautilus-script-manager;apt;nautilus;nautilus-script-manager +nautilus-columns;apt;nautilus;nautilus-columns +insync-nautilus;apt;nautilus;insync-nautilus +gtkam-gimp;apt;gimp;gtkam-gimp +gimp-gluas;apt;gimp;gimp-gluas +pandora;apt;gimp;pandora +gimp-data-extras;apt;gimp;gimp-data-extras +gimp-lensfun;apt;gimp;gimp-lensfun +gimp-gmic;apt;gimp;gimp-gmic +gimp-ufraw;apt;gimp;gimp-ufraw +gimp-texturize;apt;gimp;gimp-texturize +gimp-plugin-registry;apt;gimp;gimp-plugin-registry +rhythmbox-plugin-alternative-toolbar;apt;rhythmbox;rhythmbox-plugin-alternative-toolbar +rhythmbox-plugin-artdisplay;apt;rhythmbox;rhythmbox-plugin-artdisplay +rhythmbox-plugin-cdrecorder;apt;rhythmbox;rhythmbox-plugin-cdrecorder +rhythmbox-plugin-close-on-hide;apt;rhythmbox;rhythmbox-plugin-close-on-hide +rhythmbox-plugin-countdown-playlist;apt;rhythmbox;rhythmbox-plugin-countdown-playlist +rhythmbox-plugin-coverart-browser;apt;rhythmbox;rhythmbox-plugin-coverart-browser +rhythmbox-plugin-coverart-search;apt;rhythmbox;rhythmbox-pluginn-coverart-search +rhythmbox-plugin-desktopart;apt;rhythmbox;rhythmbox-plugin-desktopart +rhythmbox-plugin-equalizer;apt;rhythmbox;rhythmbox-plugin-equalizer +rhythmbox-plugin-fileorganizer;apt;rhythmbox;rhythmbox-plugin-fileorganizer +rhythmbox-plugin-fullscreen;apt;rhythmbox;rhythmbox-plugin-fullscreen +rhythmbox-plugin-hide;apt;rhythmbox;rhythmbox-plugin-hide +rhythmbox-plugin-jumptowindow;apt;rhythmbox;rhythmbox-plugin-jumptowindow +rhythmbox-plugin-llyrics;apt;rhythmbox;rhythmbox-plugin-llyrics +rhythmbox-plugin-looper;apt;rhythmbox;rhythmbox-plugin-looper +rhythmbox-plugin-opencontainingfolder;apt;rhythmbox;rhythmbox-plugin-opencontainingfolder +rhythmbox-plugin-parametriceq;apt;rhythmbox;rhythmbox-plugin-parametriceq +rhythmbox-plugin-playlist-import-export;apt;rhythmbox;rhythmbox-plugin-playlist +rhythmbox-plugin-podcast-pos;apt;rhythmbox;rhythmbox-plugin-podcast-pos +rhythmbox-plugin-randomalbumplayer;apt;rhythmbox;rhythmbox-plugin-randomalbumplayer +rhythmbox-plugin-rating-filters;apt;rhythmbox;rhythmbox-plugin-rating-filters +rhythmbox-plugin-remembertherhythm;apt;rhythmbox;rhythmbox-plugin-remembertherhythm +rhythmbox-plugin-repeat-one-song;apt;rhythmbox;rhythmbox-plugin-repeat-one-song +rhythmbox-plugin-rhythmweb;apt;rhythmbox;rhythmbox-plugin-rhythmweb +rhythmbox-plugin-screensaver;apt;rhythmbox;rhythmbox-plugin-screensaver +rhythmbox-plugin-smallwindow;apt;rhythmbox;rhythmbox-plugin-smallwindow +rhythmbox-plugin-spectrum;apt;rhythmbox;rhythmbox-plugin-spectrum +rhythmbox-plugin-suspend;apt;rhythmbox;rhythmbox-plugin-suspend +rhythmbox-plugin-tray-icon;apt;rhythmbox;rhythmbox-plugin-tray-icon +rhythmbox-plugin-visualizer;apt;rhythmbox;rhythmbox-plugin-visualizer +rhythmbox-plugin-wikipedia;apt;rhythmbox;rhythmbox-plugin-wikipedia +rhythmbox-plugins;apt;rhythmbox;rhythmbox-plugins +telegram-purple;apt;pidgin;telegram-purple +pidgin-skype;apt;pidgin;pidgin-skype +purple-facebook;apt;pidgin;purple-facebook +purple-hangouts;apt;pidgin;purple-hangouts +pidgin-hangouts;apt;pidgin;pidgin-hangouts +pidgin-skypeweb;apt;pidgin;pidgin-skypeweb +purple-skypeweb;apt;pidgin;purple-skypeweb +unbound;apt;unbound;unbound +ambiance-crunchy;apt;gtkthemes;ambiance-crunchy +arc-theme;apt;gtkthemes;arc-theme +ambiance-colors;apt;gtkthemes;ambiance-colors +radiance-colors;apt;gtkthemes;radiance-colors +ambiance-flat-colors;apt;gtkthemes;ambiance-flat-colors +vivacious-colors-gtk-dark;apt;gtkthemes;vivacious-colors-gtk-dark +vivacious-colors-gtk-light;apt;gtkthemes;vivacious-colors-gtk-light +yosembiance-gtk-theme;apt;gtkthemes;yosembiance-gtk-theme +ambiance-blackout-colors;apt;gtkthemes;ambiance-blackout-colors +ambiance-blackout-flat-colors;apt;gtkthemes;ambiance-blackout-flat-colors +radiance-flat-colors;apt;gtkthemes;radiance-flat-colors +vibrancy-colors;apt;gtkthemes;vibrancy-colors +vivacious-colors;apt;gtkthemes;vivacious-colors +numix-gtk-theme;apt;gtkthemes;numix-gtk-theme +arc-icons;apt;icons;arc-icons +ultra-flat-icons;apt;icons;ultra-flat-icons +myelementary;apt;icons;myelementary +ghost-flat-icons;apt;icons;ghost-flat-icons +faenza-icon-theme;apt;icons;faenza-icon-theme +faience-icon-theme;apt;icons;faience-icon-theme +vibrantly-simple-icon-theme;apt;icons;vibrantly-simple-icon-theme +rave-x-colors-icons;apt;icons;rave-x-colors-icons +ravefinity-x-icons;apt;icons;ravefinity-x-icons +numix-icon-theme;apt;icons;numix-icon-theme +numix-icon-theme-circle;apt;icons;numix-icon-theme-circle +solaar;apt;solaar;solaar +pcscd;apt;cardreader;pcscd +pcsc-tools;apt;cardreader;pcsc-tools +libacr38u;apt;cardreader;libacr38u +guvcview;apt;webcam;guvcview +cheese;apt;webcam;cheese +nvidia-370;apt;nvidia-370;nvidia-370 +nvidia-settings;apt;nvidia-370;nvidia-settings +nvidia-opencl-icd-370;apt;nvidia-370;nvidia-opencl-icd-370 +nvidia-375;apt;nvidia-375;nvidia-375 +nvidia-settings;apt;nvidia-375;nvidia-settings +nvidia-opencl-icd-375;apt;nvidia-375;nvidia-opencl-icd-375 +nvidia-378;apt;nvidia-378;nvidia-378 +nvidia-settings;apt;nvidia-378;nvidia-settings +nvidia-opencl-icd-378;apt;nvidia-378;nvidia-opencl-icd-378 +libcuda1-378;apt;nvidia-378;libcuda1-378 +nvidia-381;apt;nvidia-381;nvidia-381 +nvidia-settings;apt;nvidia-381;nvidia-settings +nvidia-opencl-icd-381;apt;nvidia-381;nvidia-opencl-icd-381 +libcuda1-381;apt;nvidia-381;libcuda1-381 +nvidia-384;apt;nvidia-384;nvidia-384 +nvidia-settings;apt;nvidia-384;nvidia-settings +nvidia-opencl-icd-384;apt;nvidia-384;nvidia-opencl-icd-384 +libcuda1-384;apt;nvidia-384;libcuda1-384 +nvidia-387;apt;nvidia-387;nvidia-387 +nvidia-settings;apt;nvidia-387;nvidia-settings +nvidia-opencl-icd-387;apt;nvidia-387;nvidia-opencl-icd-387 +libcuda1-387;apt;nvidia-387;libcuda1-387 +nvidia-390;apt;nvidia-390;nvidia-390 +nvidia-settings;apt;nvidia-390;nvidia-settings +nvidia-opencl-icd-390;apt;nvidia-390;nvidia-opencl-icd-390 +libcuda1-390;apt;nvidia-390;libcuda1-390 +nvidia-396;apt;nvidia-396;nvidia-396 +nvidia-settings;apt;nvidia-396;nvidia-settings +nvidia-opencl-icd-396;apt;nvidia-396;nvidia-opencl-icd-396 +libcuda1-396;apt;nvidia-396;libcuda1-396 +tlp;apt;tlp;tlp +notepadqq;apt;dev;notepadqq +agave;apt;dev;agave +utext;apt;dev;utext +gpick;apt;dev;gpick +virtualbox-5.2;apt;dev;virtualbox-5.2 +build-essential;apt;dev;build-essential +ubuntu-make;apt;dev;ubuntu-make +ghex;apt;dev;ghex +glade;apt;dev;glade +eric;apt;dev;eric +bluefish;apt;dev;bluefish +meld;apt;dev;meld +zeal;apt;dev;zeal +shellcheck;apt;dev;shellcheck +umbrello;apt;dev;umbrello +ack-grep;apt;dev;ack-grep +ansible;apt;dev;ansible +docker-ce;apt;dev;docker-ce +remark-lint;npm;dev;remark-lint +beautysh;pip;dev;beautysh +mycli;pip;dev;mycli +sqlitebrowser;apt;dev;sqlitebrowser +nodejs;apt;javascript;nodejs8lts +javascript-common;apt;javascript;javascript-common +yarn;npm;javascript;yarn +emma-cli;npm;javascript;emma-cli +jshint;npm;javascript;jshint +oracle-java10-installer;apt;java10;oracle-java10-installer +oracle-java10-set-default;apt;java10;oracle-java10-set-default +php7.0-cli;apt;php;php7.0-cli +php-pear;apt;php;php-pear +composer;apt;php;composer +luajit;apt;lua;luajit +ruby-dev;apt;ruby;ruby-dev +anjuta;apt;anjuta;anjuta +anjuta-extras;apt;anjuta;anjuta-extras +brackets;apt;brackets;brackets +codeblocks;apt;codeblocks;codeblocks +codeblocks-contrib;apt;codeblocks;codeblocks-contrib +geany;apt;geany;geany +geany-plugins;apt;geany;geany-plugins +geany-plugin-markdown;apt;geany;geany-plugin-markdown +pycharm-community;snap;pycharm;pycharm +sublime-text;apt;sublime-text;sublime-text +kicad;apt;cad;kicad +kicad-locale-fr;apt;cad;kicad-locale-fr +librecad;apt;cad;librecad +freecad;apt;cad;freecad +code;apt;code;code +atom;apt;atom;atom +sync-settings;apm;atom;sync-settings +sqlparse;pip;atom;sqlparse +flake8;pip;atom;flake8 +autopep8;pip;atom;autopep8 +htmlbeautifier;gem;atom;htmlbeautifier +kodi;apt;beta;kodi-beta +kodi;apt;nightly;kodi-nightly +nitrogen;apt;nitrogen;nitrogen +firefox-trunk;apt;nightly;firefox-trunk +firefox-trunk-locale-fr;apt;nightly;firefox-trunk-locale-fr +libreoffice;apt;office;libreoffice6 +winehq-devel;apt;wine;winehq-devel +winetricks;apt;wine;winetricks +playonlinux;apt;wine;playonlinux +mongodb-org;apt;mongodb;mongodb +qt4-dev-tools;apt;qt;qt4-dev-tools +qt4-linguist-tools;apt;qt;qt4-linguist-tools +qt5-doc;apt;qt;qt5-doc +qttools5-doc;apt;qt;qttools5-doc +qttools5-dev-tools;apt;qt;qttools5-dev-tools +qttools5-examples;apt;qt;qttools5-examples +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" + +#-----------------------------------------------------------------------------# +# Specific Repo list and functions # +#-----------------------------------------------------------------------------# + +# +# list of specific repositories +# fields : unique ID, function to add repo +# +AppsRepo="kodi-beta;addRepo_KodiBeta +kodi-nightly;addRepo_KodiNightly +libreoffice6;addRepo_Libreoffice6 +winehq-devel;addRepo_Wine +mongodb;addRepo_MongoDB3CE +gyazo;addRepo_Gyazo +code;addRepo_VSCode +androidstudio;addRepo_AndroidStudio +docker-ce;addRepo_DockerCE +ansible;addRepo_Ansible +etcher-electron;addRepo_Etcher +sublime-text;addRepo_SublimeText +vivaldi-stable;addRepo_Vivaldi +virtualbox-5.2;addRepo_VirtualBox +owncloud-client;addRepo_OwnCloud +syncthing-gtk;addRepo_Syncthing +opera-stable;addRepo_Opera +insync;addRepo_Insync +google-chrome-stable;addRepo_ChromeStable +atom;addRepo_Atom +nextcloud-client;addRepo_NextCloud +wireshark;addRepo_WireShark +darktable;addRepo_DarkTable +brackets;addRepo_Brackets +kicad;addRepo_Kicad +nodejs8lts;addRepo_NodeLts8 +telegram;addRepo_Telegram +skypeforlinux;addRepo_SkypeForLinux +shotwell;addRepo_Shotwell +peek;addRepo_Peek +sqlitebrowser;addRepo_SQLiteBrowser +ukuu;addRepo_Teejee2008 +aptik;addRepo_Teejee2008 +conky-manager;addRepo_Teejee2008 +avidemux2.6-plugins-qt;addRepo_Avidemux2.6 +avidemux2.6-qt;addRepo_Avidemux2.6 +tmsu;addRepo_Tmsu +quiterss;addRepo_Quiterss +transmission-gtk;addRepo_Transmissionbt +handbrake;addRepo_Handbrake +notepadqq;addRepo_Notepadqq +mumble;addRepo_Mumble +utext;addRepo_Utext +flacon;addRepo_Flacon +y-ppa-manager;addRepo_YPPAManager +shotcut;addRepo_Shotcut +diodon;addRepo_Diodon +sayonara;addRepo_Sayonara +zeal;addRepo_Zeal +corebird;addRepo_Corebird +deluge-torrent;addRepo_Deluge +deluge-gtk;addRepo_Deluge +kodi;addRepo_Kodi +indicator-sound-switcher;addRepo_IndicatorSoundSwitcher +krita;addRepo_Krita +gimp-gmic;addRepo_Gimp +gimp;addRepo_Gimp +geary;addRepo_Geary +vidcutter;addRepo_Vidcutter +ambiance-crunchy;addRepo_NoobslabThemes +arc-theme;addRepo_NoobslabThemes +ambiance-colors;addRepo_Ravefinity +radiance-colors;addRepo_Ravefinity +ambiance-flat-colors;addRepo_Ravefinity +vivacious-colors-gtk-dark;addRepo_Ravefinity +vivacious-colors-gtk-light;addRepo_Ravefinity +yosembiance-gtk-theme;addRepo_NoobslabThemes +ambiance-blackout-colors;addRepo_Ravefinity +ambiance-blackout-flat-colors;addRepo_Ravefinity +radiance-flat-colors;addRepo_Ravefinity +vibrancy-colors;addRepo_Ravefinity +vivacious-colors;addRepo_NoobslabThemes +arc-icons;addRepo_NoobslabIcons +ultra-flat-icons;addRepo_NoobslabIcons +myelementary;addRepo_NoobslabIcons +ghost-flat-icons;addRepo_NoobslabIcons +faenza-icon-theme;addRepo_NoobslabIcons +vibrantly-simple-icon-theme;addRepo_Ravefinity +rave-x-colors-icons;addRepo_Ravefinity +ravefinity-x-icons;addRepo_Ravefinity +oracle-java10-installer;addRepo_Java10 +oracle-java10-set-default;addRepo_Java10 +green-recorder;addRepo_GreenRecorder +hugin;addRepo_Hugin +simplescreenrecorder;addRepo_SimpleScreenRecorder +simplescreenrecorder-lib;addRepo_SimpleScreenRecorder +simplescreenrecorder-lib:i386;addRepo_SimpleScreenRecorder +slowmovideo;addRepo_Slowmovideo +zim;addRepo_Zim +grub-customizer;addRepo_GrubCustomizer +vlc;addRepo_VLC +numix-gtk-theme;addRepo_Numix +numix-icon-theme;addRepo_Numix +numix-icon-theme-circle;addRepo_Numix +rhythmbox-plugin-alternative-toolbar;addRepo_Rhythmbox +rhythmbox-plugin-artdisplay;addRepo_Rhythmbox +rhythmbox-plugin-cdrecorder;addRepo_Rhythmbox +rhythmbox-plugin-close-on-hide;addRepo_Rhythmbox +rhythmbox-plugin-countdown-playlist;addRepo_Rhythmbox +rhythmbox-plugin-coverart-browser;addRepo_Rhythmbox +rhythmbox-plugin-coverart-search;addRepo_Rhythmbox +rhythmbox-plugin-desktopart;addRepo_Rhythmbox +rhythmbox-plugin-equalizer;addRepo_Rhythmbox +rhythmbox-plugin-fileorganizer;addRepo_Rhythmbox +rhythmbox-plugin-fullscreen;addRepo_Rhythmbox +rhythmbox-plugin-hide;addRepo_Rhythmbox +rhythmbox-plugin-jumptowindow;addRepo_Rhythmbox +rhythmbox-plugin-llyrics;addRepo_Rhythmbox +rhythmbox-plugin-looper;addRepo_Rhythmbox +rhythmbox-plugin-opencontainingfolder;addRepo_Rhythmbox +rhythmbox-plugin-parametriceq;addRepo_Rhythmbox +rhythmbox-plugin-playlist-import-export;addRepo_Rhythmbox +rhythmbox-plugin-podcast-pos;addRepo_Rhythmbox +rhythmbox-plugin-randomalbumplayer;addRepo_Rhythmbox +rhythmbox-plugin-rating-filters;addRepo_Rhythmbox +rhythmbox-plugin-remembertherhythm;addRepo_Rhythmbox +rhythmbox-plugin-repeat-one-song;addRepo_Rhythmbox +rhythmbox-plugin-rhythmweb;addRepo_Rhythmbox +rhythmbox-plugin-screensaver;addRepo_Rhythmbox +rhythmbox-plugin-smallwindow;addRepo_Rhythmbox +rhythmbox-plugin-spectrum;addRepo_Rhythmbox +rhythmbox-plugin-suspend;addRepo_Rhythmbox +rhythmbox-plugin-tray-icon;addRepo_Rhythmbox +rhythmbox-plugin-visualizer;addRepo_Rhythmbox +rhythmbox-plugin-wikipedia;addRepo_Rhythmbox +rhythmbox-plugins;addRepo_Rhythmbox +vulkan-utils;addRepo_NvidiaDrivers +nvidia-settings;addRepo_NvidiaDrivers +nvidia-370;addRepo_NvidiaDrivers +nvidia-opencl-icd-370;addRepo_NvidiaDrivers +nvidia-375;addRepo_NvidiaDrivers +nvidia-opencl-icd-375;addRepo_NvidiaDrivers +nvidia-378;addRepo_NvidiaDrivers +nvidia-opencl-icd-378;addRepo_NvidiaDrivers +libcuda1-378;addRepo_NvidiaDrivers +nvidia-381;addRepo_NvidiaDrivers +nvidia-opencl-icd-381;addRepo_NvidiaDrivers +libcuda1-381;addRepo_NvidiaDrivers +nvidia-384;addRepo_NvidiaDrivers +nvidia-opencl-icd-384;addRepo_NvidiaDrivers +libcuda1-384;addRepo_NvidiaDrivers +nvidia-387;addRepo_NvidiaDrivers +nvidia-opencl-icd-387;addRepo_NvidiaDrivers +libcuda1-387;addRepo_NvidiaDrivers +nvidia-390;addRepo_NvidiaDrivers +nvidia-opencl-icd-390;addRepo_NvidiaDrivers +libcuda1-390;addRepo_NvidiaDrivers +nvidia-396;addRepo_NvidiaDrivers +nvidia-opencl-icd-396;addRepo_NvidiaDrivers +libcuda1-396;addRepo_NvidiaDrivers +rawtherapee;addRepo_DhorMyWay +entangle;addRepo_DhorMyWay +mkvtoolnix-gui;addRepo_MKVToolnix +purple-facebook;addRepo_Jgeboski +cpu-g;addRepo_Atareao +gqrcode;addRepo_Atareao +imagedownloader;addRepo_Atareao +audacious;addRepo_Webupd8 +nautilus-columns;addRepo_Webupd8 +nautilus-terminal;addRepo_Webupd8 +purple-hangouts;addRepo_Webupd8 +purple-skypeweb;addRepo_Webupd8 +qt5ct;addRepo_Webupd8 +syncthing-gtk;addRepo_Webupd8 +telegram-purple;addRepo_Webupd8 +screenkey;addRepo_Webupd8 +yad;addRepo_Webupd8 +woeusb;addRepo_Webupd8" + +# +# Audacious, Guake +# +function addRepo_Webupd8 () { + addPPA ppa:nilarimogard/webupd8 +} + +# +# cpu-g, gqrcode, imagedownloader +# +function addRepo_Atareao () { + addPPA ppa:atareao/atareao +} + +# +# purple facebook +# +function addRepo_Jgeboski () { + addKey "https://jgeboski.github.io/obs.key" + addRepo jgeboski.list \ + "deb http://download.opensuse.org/repositories/home:/jgeboski/xUbuntu_16.04/ ./" +} + +# +# MKVToolnix +# +function addRepo_MKVToolnix () { + addKey "https://mkvtoolnix.download/gpg-pub-moritzbunkus.txt" + addRepo mkv.list \ + "deb https://mkvtoolnix.download/ubuntu/ xenial main" \ + "deb-src https://mkvtoolnix.download/ubuntu/ xenial main" +} + +# +# Entangle, Rawtherapee +# +function addRepo_DhorMyWay () { + addPPA ppa:dhor/myway +} + +# +# Oibaf +# - newest versions of free/open GPU drivers +# - newest versions of Mesa, .... +# +function addRepo_Oibaf () { + addPPA ppa:oibaf/graphics-drivers +} + +# +# Nvidia drivers +# +function addRepo_NvidiaDrivers () { + addPPA ppa:graphics-drivers/ppa +} + +# +# Rhythmbox +# +function addRepo_Rhythmbox () { + addPPA ppa:fossfreedom/rhythmbox + addPPA ppa:fossfreedom/rhythmbox-plugins +} + +# +# Numix themes/icons +# +function addRepo_Numix () { + addPPA ppa:numix/ppa +} + +# +# ravefinity themes +# +function addRepo_Ravefinity () { + addPPA ppa:ravefinity-project/ppa +} + +# +# VLC +# +function addRepo_VLC () { + addPPA ppa:videolan/stable-daily +} + +# +# Grub-Customizer +# +function addRepo_GrubCustomizer () { + addPPA ppa:danielrichter2007/grub-customizer +} + +# +# Zim +# +function addRepo_Zim () { + addPPA ppa:jaap.karssenberg/zim +} + +# +# Slowmovideo +# +function addRepo_Slowmovideo () { + addPPA ppa:ubuntuhandbook1/slowmovideo +} + +# +# Simple-Screen-Recorder +# +function addRepo_SimpleScreenRecorder () { + addPPA ppa:maarten-baert/simplescreenrecorder +} + +# +# Hugin +# +function addRepo_Hugin () { + addPPA ppa:hugin/hugin-builds +} + +# +# Green-Recorder +# +function addRepo_GreenRecorder () { + addPPA ppa:fossproject/ppa +} + +# +# Oracle JAVA 10 +# +function addRepo_Java10 () { + addPPA ppa:linuxuprising/java +} + +# +# Noobslab icons +# +function addRepo_NoobslabIcons () { + addPPA ppa:noobslab/icons +} + +# +# Noobslab themes +# +function addRepo_NoobslabThemes () { + addPPA ppa:noobslab/themes +} + +# +# Vidcutter +# +function addRepo_Vidcutter () { + addPPA ppa:ozmartian/apps +} + + +# +# Geary +# +function addRepo_Geary () { + addPPA ppa:geary-team/releases +} + +# +# Gimp / Gmic +# +function addRepo_Gimp () { +addPPA ppa:otto-kesselgulasch/gimp +} + +# +# Krita +# +function addRepo_Krita () { + addPPA ppa:kritalime/ppa +} + +# +# indicator-sound-switcher +# +function addRepo_IndicatorSoundSwitcher () { + addPPA ppa:yktooo/ppa +} + +# +# Kodi / XBMC +# +function addRepo_Kodi () { +addPPA ppa:team-xbmc/ppa +} + +# +# Deluge +# +function addRepo_Deluge () { +addPPA ppa:deluge-team/ppa +} + +# +# Corebird +# +function addRepo_Corebird () { +addPPA ppa:ubuntuhandbook1/corebird +} + +# +# Zeal +# +function addRepo_Zeal () { + addPPA ppa:zeal-developers/ppa +} + +# +# Sayonara +# +function addRepo_Sayonara () { +addPPA ppa:lucioc/sayonara +} + +# +# Diodon +# +function addRepo_Diodon () { + addPPA ppa:diodon-team/stable +} + +# +# Shotcut +# +function addRepo_Shotcut () { + addPPA ppa:haraldhv/shotcut +} + +# +# Y-PPA-Manager +# +function addRepo_YPPAManager () { +addPPA ppa:webupd8team/y-ppa-manager +} + +# +# flacon +# +function addRepo_Flacon () { + addPPA ppa:flacon/ppa +} + +# +# Utext +# +function addRepo_Utext () { + addPPA ppa:atareao/utext +} + +# +# Mumble +# +function addRepo_Mumble () { + addPPA ppa:mumble/release +} + +# +# Notepadqq +# +function addRepo_Notepadqq () { + addPPA ppa:notepadqq-team/notepadqq +} + +# +# Handbrake +# +function addRepo_Handbrake () { + addPPA ppa:stebbins/handbrake-releases +} + +# +# Transmission-BT +# +function addRepo_Transmissionbt () { + addPPA ppa:transmissionbt/ppa +} + +# +# QuiteRSS +# +function addRepo_Quiterss () { + addPPA ppa:quiterss/quiterss +} + +# +# TMSU +# +function addRepo_Tmsu () { + addPPA ppa:tmsu/ppa +} + +# +# Avidemux +# +function addRepo_Avidemux2.6 () { + addPPA ppa:ubuntuhandbook1/avidemux +} + +# +# aptik, conky-manager, selene, timeshift, ukuu +# +function addRepo_Teejee2008 () { + addPPA ppa:teejee2008/ppa +} + +# +# SQLiteBrowser +# +function addRepo_SQLiteBrowser () { + addPPA ppa:linuxgndu/sqlitebrowser +} + +# +# Peek +# +function addRepo_Peek () { + addPPA ppa:peek-developers/stable +} + +# +# Shotwell +# +function addRepo_Shotwell () { + addPPA ppa:yg-jensge/shotwell +} + +# +# Telegram +# +function addRepo_Telegram () { + addPPA ppa:atareao/telegram +} + +# +# Skype for Linux +# +function addRepo_SkypeForLinux () { + addKey "https://repo.skype.com/data/SKYPE-GPG-KEY" + addRepo "skypeforlinux.list" \ + "deb [arch=amd64] https://repo.skype.com/deb stable main" +} + +# +# Node 8 LTS +# +function addRepo_NodeLts8 () { + addKey "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" + addRepo "nodesource.list" \ + "deb https://deb.nodesource.com/node_8.x xenial main" \ + "deb-src https://deb.nodesource.com/node_8.x xenial main" +} + +# +# Kicad 4 +# +function addRepo_Kicad () { + addPPA ppa:js-reynaud/kicad-4 +} + +# +# Brackets IDE +# +function addRepo_Brackets () { + addPPA ppa:webupd8team/brackets +} + +# +# Darktable RAW Editor +# +function addRepo_DarkTable () { + addPPA ppa:pmjdebruijn/darktable-release +} + +# +# WireShark +# +function addRepo_WireShark () { +addPPA ppa:wireshark-dev/stable +} + +# +# NextCloud +# +function addRepo_NextCloud () { + addPPA ppa:nextcloud-devs/client +} + +# +# Atom IDE +# +function addRepo_Atom () { + addKey "https://packagecloud.io/AtomEditor/atom/gpgkey" + addRepo atom.list \ + "deb [arch=amd64] https://packagecloud.io/AtomEditor/atom/any/ any main" +} + +# +# Google Chrome (stable) +# +function addRepo_ChromeStable () { + addKey "https://dl.google.com/linux/linux_signing_key.pub" + addRepo google-chrome.list \ + "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" +} + +# +# Insync +# +function addRepo_Insync () { + addKey "https://d2t3ff60b2tol4.cloudfront.net/services@insynchq.com.gpg.key" + addRepo insync.list \ + "deb http://apt.insynchq.com/ubuntu xenial non-free contrib" +} + +# +# Opera (stable) +# +function addRepo_Opera () { + addKey "http://deb.opera.com/archive.key" + addRepo opera.list \ + "deb http://deb.opera.com/opera-stable/ stable non-free" +} + +# +# Syncthing +# +function addRepo_Syncthing () { + addKey "https://syncthing.net/release-key.txt" + addRepo syncthing.list \ + "deb http://apt.syncthing.net/ syncthing release" +} + +# +# OwnCloud +# +function addRepo_OwnCloud () { + addKey "http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_16.04/Release.key" + addRepo owncloud-client.list \ + "deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_16.04/ /" +} + +# +# VirtualBox +# +function addRepo_VirtualBox () { + addKey "http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc" + addKey "http://download.virtualbox.org/virtualbox/debian/oracle_vbox_2016.asc" + addRepo virtualbox.list \ + "deb http://download.virtualbox.org/virtualbox/debian xenial contrib" +} + +# +# Vivaldi +# +function addRepo_Vivaldi () { + addKey "http://repo.vivaldi.com/stable/linux_signing_key.pub" + addRepo vivaldi.list \ + "deb http://repo.vivaldi.com/stable/deb/ stable main " +} + +# +# SublimeText +# +function addRepo_SublimeText () { + addKey "https://download.sublimetext.com/sublimehq-pub.gpg" + addRepo sublime-text.list \ + "deb https://download.sublimetext.com/ apt/dev/" +} + +# +# Etcher +# +function addRepo_Etcher () { + addKey "hkp://pgp.mit.edu:80" \ + "379CE192D401AB61" + addRepo "etcher.list" \ + "deb https://dl.bintray.com/resin-io/debian stable etcher" +} + +# +# Ansible +# +function addRepo_Ansible () { + addPPA ppa:ansible/ansible +} + +# +# Docker CE +# +function addRepo_DockerCE () { + addKey "https://download.docker.com/linux/ubuntu/gpg" + addRepo "docker.list" \ + "deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable" +} + +# +# Gyazo +# +function addRepo_Gyazo () { + addKey "https://packagecloud.io/gyazo/gyazo-for-linux/gpgkey" + addRepo "gyazo_gyazo-for-linux.list" \ + "deb https://packagecloud.io/gyazo/gyazo-for-linux/ubuntu/ xenial main" \ + "deb-src https://packagecloud.io/gyazo/gyazo-for-linux/ubuntu/ xenial main" +} + +# +# MongoDB 3 CE +# +function addRepo_MongoDB3CE () { + addKey "https://www.mongodb.org/static/pgp/server-3.6.asc" + addRepo "mongodb-org-3.6.list" \ + "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" +} + +# +# Wine Build +# +function addRepo_Wine () { + addKey "https://dl.winehq.org/wine-builds/Release.key" + addRepo "winehq.list" \ + "deb https://dl.winehq.org/wine-builds/ubuntu/ xenial main" +} + +# +# LibreOffice 6 +# +function addRepo_Libreoffice6 () { + addPPA ppa:libreoffice/ppa +} + +# +# Kodi (Beta) +# +function addRepo_KodiBeta () { + addPPA ppa:team-xbmc/unstable +} + +# +# Kodi (Nightly) +# +function addRepo_KodiNightly () { + addPPA ppa:team-xbmc/xbmc-nightly +} + +# +# Visual Studio Code +# +function addRepo_VSCode () { + addKey "https://packages.microsoft.com/keys/microsoft.asc" + addRepo "vscode.list" \ + "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main" +} + +# +# Android-Studio +# +function addRepo_AndroidStudio () { + addPPA ppa:maarten-fonville/android-studio +} + +#-----------------------------------------------------------------------------# +# Package post install functions list # +#-----------------------------------------------------------------------------# + +# +# list of post install functions +# fields : unique ID, function to process after install +# +AppsTrtFct="nitrogen;nitrogen_TrtFct +mongodb;mongodb_TrtFct +qttools5-dev-tools;qt_TrtFct +plank;plank_TrtFct +androidstudio;android_TrtFct +nodejs8lts;nodejs8lts_TrtFct" + +# +# +# +function nodejs8lts_TrtFct () { + msg "Sanitizing NodeJS install" + if which /usr/local/bin/node >/dev/null; then + runCmd "sudo rm /usr/local/bin/node" \ + "cleaning/removing legacy node files" + else + print "[INFO] nothing to clean, good :-)" + fi +} + +# +# Android Env for adb, fastboot, .... +# +function android_TrtFct () { + msg "Adding Android devices UDEV rules" + + sudo sh -c "echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0502\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Acer\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0b05\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Asus\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"413c\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Dell\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0489\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Foxconn\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04c5\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Fujitsu\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04c5\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Fujitsu-Toshiba\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"091e\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Garmin-Asus\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"18d1\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Google-Nexus\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"201E\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Haier\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"109b\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Hisense\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0bb4\", MODE=\"0666\", OWNER=\""$myHomedir"\" # HTC\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"12d1\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Huawei\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"8087\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Intel\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"24e3\", MODE=\"0666\", OWNER=\""$myHomedir"\" # K-Touch\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2116\", MODE=\"0666\", OWNER=\""$myHomedir"\" # KT Tech\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0482\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Kyocera\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"17ef\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Lenovo\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1004\", MODE=\"0666\", OWNER=\""$myHomedir"\" # LG\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"22b8\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Motorola\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0e8d\", MODE=\"0666\", OWNER=\""$myHomedir"\" # MTK\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0409\", MODE=\"0666\", OWNER=\""$myHomedir"\" # NEC\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2080\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Nook\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0955\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Nvidia\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2257\", MODE=\"0666\", OWNER=\""$myHomedir"\" # OTGV\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"10a9\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Pantech\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1d4d\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Pegatron\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0471\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Philips\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04da\", MODE=\"0666\", OWNER=\""$myHomedir"\" # PMC-Sierra\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"05c6\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Qualcomm\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1f53\", MODE=\"0666\", OWNER=\""$myHomedir"\" # SK Telesys\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04e8\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Samsung\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04dd\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sharp\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"054c\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0fce\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony Ericsson\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0fce\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony Mobile Communications\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2340\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Teleepoch\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0930\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Toshiba\n\ +SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir"\" # ZTE' > /etc/udev/rules.d/99-android.rules" + + runCmd "sudo service udev restart" \ + "restarting UDEV service" +} + +# +# Plank themes +#TODO: test it +function plank_TrtFct () { + typeset ret_code + + if ! (( $(ps -ef | grep -v grep | grep plank | wc -l) > 0 )); then + plank 2&>1 >/dev/null & + sleep 10 + fi + + yes | sh -c "cd ~ \ + && mkdir -p ~/.temp-plank-themer \ + && cd ~/.temp-plank-themer \ + && wget https://github.com/rhoconlinux/plank-themer/archive/master.zip \ + && unzip master.zip \ + && cd plank-themer-master/ \ + && rm -fR ~/.config/plank/dock1/theme_index; \ + rm -fR ~/.config/plank/dock1/themes-repo; \ + cp -a theme_index/ ~/.config/plank/dock1 \ + && cp -a themes-repo/ ~/.config/plank/dock1 \ + && cd ~ \ + && rm -R ~/.temp-plank-themer \ + && sh ~/.config/plank/dock1/theme_index/plank-on-dock-themer.sh" &>> $logFile + ret_code=$? + retCode $ret_code +} + +# +# QT5 Dev Tools +# +function qt_TrtFct () { + runCmd "sudo ln -s /usr/share/qtchooser/qt5-x86_64-linux-gnu.conf /usr/lib/x86_64-linux-gnu/qtchooser/default.conf" \ + "set QT5 as default" + + createAppShortcut "/usr/bin/designer" \ + "" \ + "GNOME;GTK;Development;IDE" \ + "QT Designer 5" \ + "local" \ + update-menus +} + +# +# MongoDB 3 CE +# +function mongodb_TrtFct () { + runCmd "sudo systemctl enable mongod.service" \ + "enabling mongod service at boot" + runCmd "sudo systemctl start mongod.service" \ + "starting mongod service" +} + +# +# nitrogen post install function +# +function nitrogen_TrtFct () { + if isMate; then + runCmd "gsettings set org.mate.background draw-background false" \ + "disabling Caja background management" + runCmd "gsettings set org.mate.background show-desktop-icons false" \ + "disabling Caja desktop icons management" + + createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ + "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ + "Utility;GTK" \ + "Nitrogen" \ + "local" \ + "start" + update-menus + else + printf "[ERR] only Mate Desktop is currently supported\n" + fi +} diff --git a/tools_functions.sh b/tools_functions_ub1604.sh similarity index 100% rename from tools_functions.sh rename to tools_functions_ub1604.sh diff --git a/tools_functions_ub1804.sh b/tools_functions_ub1804.sh new file mode 100644 index 0000000..adfce03 --- /dev/null +++ b/tools_functions_ub1804.sh @@ -0,0 +1,145 @@ +#------------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#------------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# tools and config functions # +#-----------------------------------------------------------------------------# + +# +# enable ufw at boot time and add rules for installed apps +# +function enableUFW () { + runCmd "sudo ufw enable"\ + "enabling UFW at boot" + + if which syncthing >/dev/null; then + runCmd "sudo ufw allow syncthing" \ + "adding UFW rules for Syncthing" + fi +} + +# +# enable numlock by default on LightDM +# +function enableNumLockX () { + checkAndInstallDep apt numlockx numlockx + if which lightdm >/dev/null; then + runCmd "sudo cp /etc/lightdm/lightdm.conf.d/70-linuxmint.conf /etc/lightdm/lightdm.conf.d/70-linuxmint.conf.yggbak" \ + "backing up lightdm original config file" + runCmd "echo -e '\ngreeter-setup-script=/usr/bin/numlockx on' | sudo tee -a /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \ + "enabling numlockx on in lightdm at boot" + fi +} + +# +# /tmp in RAM by modifying /etc/fstab +#TODO: add possibily to choose amount of ram +function enableTmpRAM () { + runCmd "echo 'tmpfs /tmp tmpfs defaults,size=2g 0 0' | sudo tee -a /etc/fstab" \ + "enabling /tmp in RAM by modifying /etc/fstab" + if (whiptail --title "/tmp in RAM - Reboot" --yesno "Reboot required, proceed now ?" 10 60) then + sudo reboot + fi +} + +# +# add screenfetch exec in .bashrc +# +function addScreenfetchBashrc () { + checkAndInstallDep apt screenfetch screenfetch + runCmd "touch /home/$myHomedir/.bashrc" \ + "creating .bashrc file if necessary" \ + runCmd "echo 'screenfetch -t' | tee -a /home/$myHomedir/.bashrc" \ + "adding screenfetch to .bashrc" +} + +# +# cli history cmd timestamp enable +# +function enableHistoryTS () { + typeset ret_code + printf "enabling CLI History TimeStamp " + echo "export HISTTIMEFORMAT='%F %T '" | tee -a /home/$myHomedir/.bashrc &>> $logFile + ret_code=$? + retCode $ret_code +} + +# +# install/enable auto install of security updates +# +function installUnattendedUpgrades () { + installPackage apt unattended-upgrades +} + +# +# display useful system/hardware informations +# +function toolInxi () { + checkAndInstallDep apt inxi inxi \ + && inxi -F +} + +# +# check bandwith and latency of the internet connection +# +function toolSpeedtestCli () { + checkAndInstallDep pip speedtest-cli speedtest-cli \ + && speedtest-cli +} + +# +# check for packet loss +# +function toolPacketLoss () { + ping -q -c 10 google.com +} + +# +# Optimization of SQLite databases of Firefox and Firefox Nightly +# +function toolOptimizeFirefox () { + if (whiptail --title "Firefox SQLite DB Optimization" --yesno "Terminate Firefox and proceed ?" 10 60) then + if which firefox >/dev/null; then + printf "Optimizing Firefox" + pkill -9 firefox + for f in ~/.mozilla/firefox/*/*.sqlite; do sqlite3 $f 'VACUUM; REINDEX;'; done + printf "\n" + fi + if which firefox-trunk >/dev/null; then + printf "Optimizing Firefox Nightly" + pkill -9 firefox-trunk + for f in ~/.mozilla/firefox-trunk/*/*.sqlite; do sqlite3 $f 'VACUUM; REINDEX;'; done + printf "\n" + fi + fi +} + +# +# remove useless packages (depedencies) +# +function toolAutoremove () { + runCmd "sudo apt-get -y autoremove" \ + "removing not necessary dependencies" +} + +# +# remove old versions of installed kernels +# +function toolClearOldKernels () { + checkAndInstallDep apt ukuu ukuu \ + && runCmd "sudo ukuu --purge-old-kernels --yes" \ + "removing old kernels" +} + +# +# force soundcards detection +# +function toolSoundCardsDetection () { + runCmd "sudo alsa force-reload" \ + "detecting ALSA sound cards" +} \ No newline at end of file diff --git a/yggdrasil.sh b/yggdrasil.sh index 6a12f10..e43bd9e 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -12,11 +12,23 @@ # dir=$(dirname $0) source /opt/yggdrasil/vars.sh -source /opt/yggdrasil/core_functions.sh -source /opt/yggdrasil/repo_functions.sh -source /opt/yggdrasil/install_functions.sh -source /opt/yggdrasil/menus_functions.sh -source /opt/yggdrasil/tools_functions.sh + +OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` +if [[ $OS == *"Linux Mint 18"* ]]; then + source /opt/yggdrasil/core_functions_ub1604.sh + source /opt/yggdrasil/repo_functions_ub1604.sh + source /opt/yggdrasil/install_functions_ub1604.sh + source /opt/yggdrasil/menus_functions_ub1604.sh + source /opt/yggdrasil/tools_functions_ub1604.sh +elif [[ $OS == *"Ubuntu 18.04 LTS"* ]]; then + source /opt/yggdrasil/core_functions_ub1804.sh + source /opt/yggdrasil/repo_functions_ub1804.sh + source /opt/yggdrasil/install_functions_ub1804.sh + source /opt/yggdrasil/menus_functions_ub1804.sh + source /opt/yggdrasil/tools_functions_ub1804.sh +else + return 1 +fi # # check if the script is running in root/sudo From 518a25912bff28436b1a896b32baeb1367d71206 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 26 May 2018 23:27:02 +0200 Subject: [PATCH 014/261] warning msg for no supported distro --- yggdrasil.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/yggdrasil.sh b/yggdrasil.sh index e43bd9e..567ab97 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -27,7 +27,10 @@ elif [[ $OS == *"Ubuntu 18.04 LTS"* ]]; then source /opt/yggdrasil/menus_functions_ub1804.sh source /opt/yggdrasil/tools_functions_ub1804.sh else - return 1 + printf "\n" + printf $BOLDROUGE"Distribution non supportée/testée"$NORMAL + printf "\n\n" + exit fi # From b83df8fe423dd844a958bf2d7dd7ec27766d1cd6 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 26 May 2018 23:33:31 +0200 Subject: [PATCH 015/261] comments changed for 18.04 --- core_functions_ub1804.sh | 26 ++++++++++++++++---------- install_functions_ub1804.sh | 20 +++++++++++++------- menus_functions_ub1804.sh | 20 +++++++++++++------- repo_functions_ub1804.sh | 20 +++++++++++++------- tools_functions_ub1804.sh | 20 +++++++++++++------- 5 files changed, 68 insertions(+), 38 deletions(-) diff --git a/core_functions_ub1804.sh b/core_functions_ub1804.sh index 1c54fbc..50a1a4e 100644 --- a/core_functions_ub1804.sh +++ b/core_functions_ub1804.sh @@ -1,14 +1,20 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# -#------------------------------------------------------------------------------# -# core functions # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# # +# Ubuntu 18.04 / Linux Mint 19 # +# # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# core functions # +#-----------------------------------------------------------------------------# # # display a simple message + CR diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index e4abfd5..c2ed85a 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -1,10 +1,16 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# # +# Ubuntu 18.04 / Linux Mint 19 # +# # +#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------# # install functions # diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 3eb1ec2..b898a6a 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -1,10 +1,16 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# # +# Ubuntu 18.04 / Linux Mint 19 # +# # +#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------# # menus functions # diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index cfb15c8..d8f14b7 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1,10 +1,16 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# # +# Ubuntu 18.04 / Linux Mint 19 # +# # +#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------# # list of apps with required package manager and category # diff --git a/tools_functions_ub1804.sh b/tools_functions_ub1804.sh index adfce03..d6f5a76 100644 --- a/tools_functions_ub1804.sh +++ b/tools_functions_ub1804.sh @@ -1,10 +1,16 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# # +# Ubuntu 18.04 / Linux Mint 19 # +# # +#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------# # tools and config functions # From d44af9c3089e664008ad51baccd119c4c12b7d70 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 26 May 2018 23:36:16 +0200 Subject: [PATCH 016/261] comments changed for 16.04 --- core_functions_ub1604.sh | 26 ++++++++++++++++---------- install_functions_ub1604.sh | 14 +++++++------- menus_functions_ub1604.sh | 20 +++++++++++++------- repo_functions_ub1604.sh | 20 +++++++++++++------- tools_functions_ub1604.sh | 20 +++++++++++++------- 5 files changed, 62 insertions(+), 38 deletions(-) diff --git a/core_functions_ub1604.sh b/core_functions_ub1604.sh index 1c54fbc..b366252 100644 --- a/core_functions_ub1604.sh +++ b/core_functions_ub1604.sh @@ -1,14 +1,20 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# -#------------------------------------------------------------------------------# -# core functions # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# # +# Ubuntu 16.04 / Linux Mint 18 # +# # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# core functions # +#-----------------------------------------------------------------------------# # # display a simple message + CR diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index e4abfd5..c1212a8 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -1,10 +1,10 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------# # install functions # diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh index 3eb1ec2..6f5e010 100644 --- a/menus_functions_ub1604.sh +++ b/menus_functions_ub1604.sh @@ -1,10 +1,16 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# # +# Ubuntu 16.04 / Linux Mint 18 # +# # +#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------# # menus functions # diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index cfb15c8..5b9ae0d 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -1,10 +1,16 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# # +# Ubuntu 16.04 / Linux Mint 18 # +# # +#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------# # list of apps with required package manager and category # diff --git a/tools_functions_ub1604.sh b/tools_functions_ub1604.sh index adfce03..427b696 100644 --- a/tools_functions_ub1604.sh +++ b/tools_functions_ub1604.sh @@ -1,10 +1,16 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# # +# Ubuntu 16.04 / Linux Mint 18 # +# # +#-----------------------------------------------------------------------------# #-----------------------------------------------------------------------------# # tools and config functions # From 369732231a41ba5d4085c724979223a53b5319b6 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 26 May 2018 23:37:49 +0200 Subject: [PATCH 017/261] repo functions modified for bionic --- repo_functions_ub1804.sh | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index d8f14b7..a6aa750 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -636,8 +636,8 @@ function addRepo_Jgeboski () { function addRepo_MKVToolnix () { addKey "https://mkvtoolnix.download/gpg-pub-moritzbunkus.txt" addRepo mkv.list \ - "deb https://mkvtoolnix.download/ubuntu/ xenial main" \ - "deb-src https://mkvtoolnix.download/ubuntu/ xenial main" + "deb https://mkvtoolnix.download/ubuntu/ bionic main" \ + "deb-src https://mkvtoolnix.download/ubuntu/ bionic main" } # @@ -960,8 +960,8 @@ function addRepo_SkypeForLinux () { function addRepo_NodeLts8 () { addKey "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" addRepo "nodesource.list" \ - "deb https://deb.nodesource.com/node_8.x xenial main" \ - "deb-src https://deb.nodesource.com/node_8.x xenial main" + "deb https://deb.nodesource.com/node_8.x bionic main" \ + "deb-src https://deb.nodesource.com/node_8.x bionic main" } # @@ -1023,7 +1023,7 @@ function addRepo_ChromeStable () { function addRepo_Insync () { addKey "https://d2t3ff60b2tol4.cloudfront.net/services@insynchq.com.gpg.key" addRepo insync.list \ - "deb http://apt.insynchq.com/ubuntu xenial non-free contrib" + "deb http://apt.insynchq.com/ubuntu bionic non-free contrib" } # @@ -1060,7 +1060,7 @@ function addRepo_VirtualBox () { addKey "http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc" addKey "http://download.virtualbox.org/virtualbox/debian/oracle_vbox_2016.asc" addRepo virtualbox.list \ - "deb http://download.virtualbox.org/virtualbox/debian xenial contrib" + "deb http://download.virtualbox.org/virtualbox/debian bionic contrib" } # @@ -1104,7 +1104,7 @@ function addRepo_Ansible () { function addRepo_DockerCE () { addKey "https://download.docker.com/linux/ubuntu/gpg" addRepo "docker.list" \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable" + "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable" } # @@ -1113,8 +1113,8 @@ function addRepo_DockerCE () { function addRepo_Gyazo () { addKey "https://packagecloud.io/gyazo/gyazo-for-linux/gpgkey" addRepo "gyazo_gyazo-for-linux.list" \ - "deb https://packagecloud.io/gyazo/gyazo-for-linux/ubuntu/ xenial main" \ - "deb-src https://packagecloud.io/gyazo/gyazo-for-linux/ubuntu/ xenial main" + "deb https://packagecloud.io/gyazo/gyazo-for-linux/ubuntu/ bionic main" \ + "deb-src https://packagecloud.io/gyazo/gyazo-for-linux/ubuntu/ bionic main" } # @@ -1123,7 +1123,7 @@ function addRepo_Gyazo () { function addRepo_MongoDB3CE () { addKey "https://www.mongodb.org/static/pgp/server-3.6.asc" addRepo "mongodb-org-3.6.list" \ - "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" + "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/3.6 multiverse" } # @@ -1132,7 +1132,7 @@ function addRepo_MongoDB3CE () { function addRepo_Wine () { addKey "https://dl.winehq.org/wine-builds/Release.key" addRepo "winehq.list" \ - "deb https://dl.winehq.org/wine-builds/ubuntu/ xenial main" + "deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main" } # From 0408fcbe24116e544dae26b293fe67fd988dc922 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 00:58:00 +0200 Subject: [PATCH 018/261] some changes about source files structure --- core_functions_ub1604.sh => core_functions.sh | 0 core_functions_ub1804.sh | 661 ------------------ ..._functions_ub1604.sh => tools_functions.sh | 0 tools_functions_ub1804.sh | 151 ---- yggdrasil.sh | 40 +- 5 files changed, 22 insertions(+), 830 deletions(-) rename core_functions_ub1604.sh => core_functions.sh (100%) delete mode 100644 core_functions_ub1804.sh rename tools_functions_ub1604.sh => tools_functions.sh (100%) delete mode 100644 tools_functions_ub1804.sh diff --git a/core_functions_ub1604.sh b/core_functions.sh similarity index 100% rename from core_functions_ub1604.sh rename to core_functions.sh diff --git a/core_functions_ub1804.sh b/core_functions_ub1804.sh deleted file mode 100644 index 50a1a4e..0000000 --- a/core_functions_ub1804.sh +++ /dev/null @@ -1,661 +0,0 @@ -#-----------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : see documentation or man pages # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#-----------------------------------------------------------------------------# - -#-----------------------------------------------------------------------------# -# # -# Ubuntu 18.04 / Linux Mint 19 # -# # -#-----------------------------------------------------------------------------# - -#-----------------------------------------------------------------------------# -# core functions # -#-----------------------------------------------------------------------------# - -# -# display a simple message + CR -# -function smsgn () { - printf "$*\n" -} - -# -# display a simple message -# -function smsg () { - printf "$*" -} - -# -# display a message + notification -# -function msg () { - printf "\n" - printf $JAUNE - if [ "$#" -gt "0" ]; then - printf "$*\n" - /usr/bin/notify-send -t 7000 "$*" - fi - printf $NORMAL -} - -# -# display a message between [ ] depending of the ret_code -# -function retCode () { - typeset ret_code="$1" - if [ $ret_code == 0 ]; then - printf "[ "$BOLDVERT"OK"$NORMAL" ] " - else - printf "[ "$BOLDROUGE"!!"$NORMAL" ] " - fi - printf "\n" -} - -# -# run a shell command and display a message between [ ] depending on the ret_code -# -function runCmd () { - typeset cmd="$1" - typeset txt="$2" - typeset ret_code - - printf "[CMD] $txt " - printf "\n[CMD] $txt : $cmd\n" &>> $logFile - eval $cmd" &>> $logFile" - ret_code=$? - retCode $ret_code -} - -# -# display a message + notification + ask to push a key to continue -# -function pressKey () { - printf "$*\n" - if which mpg123 >/dev/null; then - mpg123 -q /opt/yggdrasil/notify.mp3 & - fi - printf $INV - read -p "Press key to continue ..." - printf $NORMAL -} - -# -# check if OS is Mint -# -function isMint () { - OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` - if [[ $OS == *"Linux Mint 18"* ]]; then - return 0 - else - return 1 - fi -} - -# -# check if DE is Mate -# -function isMate () { - if [[ $DESKTOP_SESSION == *"mate"* ]]; then - return 0 - else - return 1 - fi -} - -# -# check and install required dependencies for Yggdrasil -# -function yggInit () { - typeset ret_code - - printf "[INIT]" - runCmd "echo sience-config science-config/group select '$myHomedir ($myHomedir)' | sudo debconf-set-selections" \ - "apply settings for science-config pkg" - - if ! dpkg --print-foreign-architectures | grep -qi i386; then - printf "[INIT]" - runCmd "sudo dpkg --add-architecture i386" \ - "adding i386 architecture" - else - printf "[INIT] i386 architecture already added [ "$BOLDVERT"OK"$NORMAL" ] \n" - fi - - printf "[INIT]" - addPPA ppa:ubuntu-desktop/ubuntu-make - - printf "[INIT][APT] update " - printf "\n[INIT][APT] update\n" &>> $logFile - sudo apt-get update &>> $logFile - ret_code=$? - retCode $ret_code - - printf "[INIT]" - installPackage apt "apt-transport-https" - - if ! which umake >/dev/null; then - printf "[INIT][UMAKE] not found, installing...\n" - printf "\n[INIT][UMAKE] not found, installing...\n" &>> $logFile - installPackage apt "ubuntu-make" - else - printf "[INIT][UMAKE] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - fi - - if ! which gem >/dev/null; then - printf "[INIT][GEM] not found, installing...\n" - printf "\n[INIT][GEM] not found, installing...\n" &>> $logFile - installPackage apt "ruby-dev" - else - printf "[INIT][GEM] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - fi - - if ! which snap >/dev/null; then - printf "[INIT][SNAP] not found, installing...\n" - printf "\n[INIT][SNAP] not found, installing...\n" &>> $logFile - installPackage apt "snapd" - else - printf "[INIT][SNAP] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - fi - - if ! which npm >/dev/null; then - printf "[INIT][NPM] not found, installing...\n" - printf "\n[INIT][NPM] not found, installing...\n" &>> $logFile - installPackage apt "nodejs" - else - printf "[INIT][NPM] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - fi - - if ! which pip3 >/dev/null; then - printf "[INIT][PIP] not found, installing...\n" - printf "\n[INIT][PIP] not found, installing...\n" &>> $logFile - printf "[INIT]" - installPackage apt "python3-pip" - printf "[INIT]" - installPackage pip "pip" - printf "[INIT]" - installPackage pip "setuptools" - else - printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - printf "[INIT]" - installPackage pip "pip" - printf "[INIT]" - installPackage pip "setuptools" - fi -} - -# -# update kernel to the latest version -# -function kernelUpdate () { - checkAndInstallDep apt ukuu ukuu \ - && runCmd "sudo ukuu --install-latest --yes" \ - "installing latest kernel" -} - -# -# system update -#TODO: add pip, npm (yarn?), gem -# -function updateSystem () { - typeset ret_code - - printf "[APT] update " - printf "\n[APT] update\n" &>> $logFile - sudo apt-get update &>> $logFile - ret_code=$? - retCode $ret_code - - printf "[APT] upgrade " - printf "\n[APT] upgrade\n" &>> $logFile - sudo apt-get -y upgrade &>> $logFile - ret_code=$? - retCode $ret_code - - printf "[APT] dist-upgrade " - printf "\n[APT] dist-upgrade\n" &>> $logFile - sudo apt-get -y dist-upgrade &>> $logFile - ret_code=$? - retCode $ret_code - - if which snap >/dev/null; then - printf "[SNAP] refresh " - printf "\n[SNAP] refresh\n" &>> $logFile - sudo snap refresh &>> $logFile - ret_code=$? - retCode $ret_code - fi - - repoAdded=0 -} - -# -# add ppa -# input : ppa name -# -function addPPA () { - typeset ret_code - - prefix="ppa:" - str="$*" - str2search=${str#$prefix} - - if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -q ${str2search}; then - printf "[PPA] adding : $* " - printf "\n[PPA] adding $*\n" &>> $logFile - sudo add-apt-repository -y $* &>> $logFile - ret_code=$? - retCode $ret_code - else - printf "[PPA] PPA already added [ "$BOLDVERT"OK"$NORMAL" ] \n" - fi -} - -# -# add repo's key -# input : file's url OR keyserver + key -# -function addKey () { - typeset ret_code - - case $# in - "1") - printf "[REPO] adding key from file : $1 " - printf "\n[REPO] adding key from file $1\n" &>> $logFile - wget -qO - $1 | sudo apt-key add - &>> $logFile - ret_code=$? - retCode $ret_code - ;; - "2") - printf "[REPO] adding key $2 from $1 " - printf "\n[REPO] adding key $2 from $1\n" &>> $logFile - gpg --keyserver $1 --recv-keys $2 &>> $logFile \ - && gpg -a --export $2 | sudo apt-key add - &>> $logFile - ret_code=$? - retCode $ret_code - ;; - esac -} - -# -# create new entry in /etc/apt/source.list.d/ -# input : filename, repo, src repo -# -function addRepo () { - typeset ret_code - printf "[REPO] adding : $2 in $1 " - printf "\n[REPO] adding $2 in $1\n" &>> $logFile - echo $2 | sudo tee /etc/apt/sources.list.d/$1 &>> $logFile - 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 -} - -# -# install package manually -# input : url of package, package name, menu mode -# -function installPackageDpkg () { - printf "[PKG] Installing $2 from $1 " - printf "\n[PKG] installing $2 from $1\n" &>> $logFile - cd /tmp \ - && wget -q -O $2 $1 &>> $logFile \ - && sudo dpkg -i $2 &>> $logFile - sudo apt-get install -fy &>> $logFile - ret_code=$? - retCode $ret_code - if [ "$3" == "yes" ]; then - pressKey - fi -} - -# -# install package from repositories -# input : package manager, package name -# package manager available : apt, pip, npm, gem, snap -# TODO: add apm, flatpak, umake?, use yarn instead of npm ? -# -function installPackage () { - typeset pkg="$2" - typeset ret_code - - case $1 in - "apt") - printf "[APT] Installing $pkg " - printf "\n[APT] installing $pkg\n" &>> $logFile - sudo apt-get install -fy $pkg &>> $logFile - ret_code=$? - retCode $ret_code - ;; - "pip") - if which pip3 >/dev/null; then - printf "[PIP] Installing $pkg " - printf "\n[PIP] installing $pkg\n" &>> $logFile - sudo -H pip3 install --upgrade $pkg &>> $logFile - ret_code=$? - retCode $ret_code - fi - ;; - "npm") - if which npm >/dev/null; then - printf "[NPM] Installing $pkg " - printf "\n[NPM] installing $pkg\n" &>> $logFile - sudo npm install -g $pkg &>> $logFile - ret_code=$? - retCode $ret_code - fi - ;; - "gem") - if which gem >/dev/null; then - printf "[GEM] Installing $pkg " - printf "\n[GEM] installing $pkg\n" &>> $logFile - sudo gem install $pkg &>> $logFile - ret_code=$? - retCode $ret_code - fi - ;; - "snap") - if which snap >/dev/null; then - printf "[SNAP] Installing $pkg " - printf "\n[SNAP] installing $pkg\n" &>> $logFile - sudo snap install $pkg --classic &>> $logFile - ret_code=$? - retCode $ret_code - fi - ;; - esac -} - -# -# check dependency and install it if necessary -# input : package manager, package name, cmd/bin to check -# -function checkAndInstallDep () { - if ! which $3 >/dev/null; then - printf "[DEP] dependency $2 not found [ "$BOLDROUGE"!!"$NORMAL" ]\n" - printf "[DEP] dependency $2 not found\n" &>> $logFile - case $1 in - "apt") - installPackage apt $2 - ;; - "npm") - installPackage npm $2 - ;; - "pip") - installPackage pip $2 - ;; - "gem") - installPackage gem $2 - ;; - "snap") - installPackage snap $2 - ;; - esac - fi -} - -# -# add specific repository for a given package -# input : unique ID, apt cache update yes/no -# -function addSpecificRepoFct () { - for i in $AppsRepo; do - appRepo=(${i//;/ }) - if [ "${appRepo[0]}" == "$1" ]; then - printf "[ADD] package -- $1 -- repo/ppa " - printf "added by function -- ${appRepo[1]}\n" - eval "${appRepo[1]}" - repoAdded=$(($repoAdded+1)) - fi - done - if [ "$2" == "yes" ]; then - updateSystem - fi - unset i - unset appRepo -} - -# -# find and execute Pre/Post install functions for a specific app -# input : unique ID -# -function processAppTrtFct () { - for i in $AppsTrtFct; do - appTrtFct=(${i//;/ }) - if [ "${appTrtFct[0]}" == "$1" ]; then - printf "[TRT] package -- $1 -- " - printf "post install processed by -- ${appTrtFct[1]}\n" - eval "${appTrtFct[1]}" - fi - done -} - -# -# install all about a specific category from Apps array app list (headless) -# input : category name -# -function installAppsFromList () { - msg "Installing apps from $1 category" - for i in $Apps; do - app=(${i//;/ }) - if [ "${app[2]}" == "$1" ]; then - addSpecificRepoFct ${app[3]} - fi - done - unset i - unset app - if [ "$repoAdded" -gt "0" ]; then - updateSystem - fi - for i in $Apps; do - app=(${i//;/ }) - if [ "${app[2]}" == "$1" ]; then - installPackage ${app[1]} ${app[0]} - processAppTrtFct ${app[3]} - fi - done -} - -# -# generate install apps menu about a specific category from Apps array app list (Menu) -# input : category name -# -function installAppsFromListMenu () { - for i in $Apps; do - app=(${i//;/ }) - if [ "${app[2]}" == "$1" ]; then - list+=("${app[3]}" "${app[3]}" "ON") - fi - done - - pkg=$(whiptail \ - --title "Yggdrasil $version - App Install ($1)" \ - --checklist \ - "Select app to install and press OK" 25 80 19 \ - "${list[@]}" 3>&1 1>&2 2>&3) - - exitstatus=$? - if [ $exitstatus = 0 ]; then - for pkgToInstall in $pkg; do - for i in $Apps; do - app=(${i//;/ }) - if [ "${app[3]}" == "${pkgToInstall//\"}" ]; then - addSpecificRepoFct ${app[3]} - fi - done - done - unset i - unset app - unset pkgToInstall - if [ "$repoAdded" -gt "0" ]; then - updateSystem - fi - for pkgToInstall in $pkg; do - for i in $Apps; do - app=(${i//;/ }) - if [ "${app[3]}" == "${pkgToInstall//\"}" ]; then - installPackage ${app[1]} ${app[0]} - processAppTrtFct ${app[3]} - fi - done - done - fi - unset list - pressKey -} - -# -# create app shortcut -# inputs : bin to exec, icon path, category, name, local/global, start w/ session -# -function createAppShortcut () { - typeset ret_code - - shortcut='[Desktop Entry]\n' - shortcut+='Encoding=UTF-8\n' - shortcut+='Terminal=0\n' - shortcut+='Exec='$1'\n' - shortcut+='Icon='$2'\n' - shortcut+='Type=Application\n' - if [ "$6" == "start" ]; then - shortcut+='X-MATE-Autostart-enabled=true\n\n' - else - shortcut+='Categories='$3';\n' - fi - shortcut+='StartupNotify=true\n' - shortcut+='Name='$4'\n' - shortcut+='GenericName='$4'\n' - shortcut+='Comment=' - - if [ "$5" == "global" ]; then - smsg "creating shortcut for $4 " - echo -e $shortcut > /usr/share/applications/"$4".desktop - ret_code=$? - retCode $ret_code - else - mkdir -p /home/$myHomedir/.local/share/applications - smsg "creating shortcut for $4 " - echo -e $shortcut > /home/"$myHomedir"/.local/share/applications/"$4".desktop - ret_code=$? - retCode $ret_code - fi -} - -# -# show Yggdrasil logo -# -function dispLogo () { - printf "\n" - printf $BOLDJAUNE - printf "██╗ ██╗ ██████╗ ██████╗ ██████╗ ██████╗ █████╗ ███████╗██╗██╗ \n" - printf "╚██╗ ██╔╝██╔════╝ ██╔════╝ ██╔══██╗██╔══██╗██╔══██╗██╔════╝██║██║ \n" - printf " ╚████╔╝ ██║ ███╗██║ ███╗██║ ██║██████╔╝███████║███████╗██║██║ \n" - printf " ╚██╔╝ ██║ ██║██║ ██║██║ ██║██╔══██╗██╔══██║╚════██║██║██║ \n" - printf " ██║ ╚██████╔╝╚██████╔╝██████╔╝██║ ██║██║ ██║███████║██║███████╗\n" - printf " ╚═╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝╚═╝╚══════╝\n" - printf "$BOLDROUGE Customize Linux Mint & Ubuntu derivatives made easier\n" - printf "$BOLDBLANC ver "$version" - GPLv3 - Francois B. (Makotosan) - makotonoblog.be\n" - printf "\n" -} - -# -# show usage for headless mode -# -function usage () { - dispLogo - dispSysInfos - printf "\n" - printf $NORMAL - printf "Usage : yggdrasil [options]\n\n" - printf " "$BOLDVERT"-f"$NORMAL" : install everything (see man pages for more details)(a+c+d+q)\n" - printf " "$BOLDVERT"-a"$NORMAL" : install all apps\n" - printf " "$BOLDVERT"-c"$NORMAL" : install Themes and Icons\n" - printf " "$BOLDVERT"-w"$NORMAL" : install Nitrogen + remove desktop management from caja\n" - printf " "$BOLDVERT"-d"$NORMAL" : install DNS Cache Unbound\n" - printf " "$BOLDVERT"-q"$NORMAL" : install cardreader apps\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"-n"$NORMAL" : install lastest Nvidia graphic drivers\n" - printf " "$BOLDVERT"-g"$NORMAL" : install lastest free graphic drivers (nouveau, amdgpu, ati, intel), mesa, ...\n" - printf " "$BOLDVERT"-k"$NORMAL" : update system to the latest kernel\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" - printf " "$BOLDVERT"-h"$NORMAL" : show help & informations\n" - printf "\n" -} - -function dispSysInfos () { - # CPU Architecture - printf $BOLDVERT"Architecture : "$NORMAL - uname -m - - # Current user homedir - printf $BOLDVERT"User (userdir) :"$NORMAL" $myHomedir\n" - - # Linux Distro Name - printf $BOLDVERT"OS : "$NORMAL - lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}' - - # Kernel version - printf $BOLDVERT"Kernel : "$NORMAL - uname -r - - # Desktop Name - printf $BOLDVERT"Desktop : "$NORMAL - case $XDG_CURRENT_DESKTOP in - "ENLIGHTENMENT") - printf "Enlightenment" - printf "\n" - ;; - "GNOME") - printf "Gnome" - printf "\n" - ;; - "KDE") - printf "KDE" - printf "\n" - ;; - "LXDE") - printf "LXDE" - printf "\n" - ;; - "MATE") - printf "Mate" - printf "\n" - ;; - "XFCE") - printf "XFCE" - printf "\n" - ;; - "X-Cinnamon") - printf "Cinnamon" - printf "\n" - ;; - "Unity") - printf "Unity" - printf "\n" - ;; - esac - - # Screen Resolution - printf $BOLDVERT"Screen resolution : "$NORMAL - xdpyinfo | sed -n 's/.*dim.* \([0-9]*x[0-9]*\) .*/\1/pg' | tr '\n' ' ' - printf "\n" - - # Type of Shell - printf $BOLDVERT"Shell : "$NORMAL - shellType=$(ps -p $PPID -o cmd --no-heading) - shellType=${shellType/-} - shellType=${shellType//*\/} - printf $shellType"\n" -} diff --git a/tools_functions_ub1604.sh b/tools_functions.sh similarity index 100% rename from tools_functions_ub1604.sh rename to tools_functions.sh diff --git a/tools_functions_ub1804.sh b/tools_functions_ub1804.sh deleted file mode 100644 index d6f5a76..0000000 --- a/tools_functions_ub1804.sh +++ /dev/null @@ -1,151 +0,0 @@ -#-----------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : see documentation or man pages # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#-----------------------------------------------------------------------------# - -#-----------------------------------------------------------------------------# -# # -# Ubuntu 18.04 / Linux Mint 19 # -# # -#-----------------------------------------------------------------------------# - -#-----------------------------------------------------------------------------# -# tools and config functions # -#-----------------------------------------------------------------------------# - -# -# enable ufw at boot time and add rules for installed apps -# -function enableUFW () { - runCmd "sudo ufw enable"\ - "enabling UFW at boot" - - if which syncthing >/dev/null; then - runCmd "sudo ufw allow syncthing" \ - "adding UFW rules for Syncthing" - fi -} - -# -# enable numlock by default on LightDM -# -function enableNumLockX () { - checkAndInstallDep apt numlockx numlockx - if which lightdm >/dev/null; then - runCmd "sudo cp /etc/lightdm/lightdm.conf.d/70-linuxmint.conf /etc/lightdm/lightdm.conf.d/70-linuxmint.conf.yggbak" \ - "backing up lightdm original config file" - runCmd "echo -e '\ngreeter-setup-script=/usr/bin/numlockx on' | sudo tee -a /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \ - "enabling numlockx on in lightdm at boot" - fi -} - -# -# /tmp in RAM by modifying /etc/fstab -#TODO: add possibily to choose amount of ram -function enableTmpRAM () { - runCmd "echo 'tmpfs /tmp tmpfs defaults,size=2g 0 0' | sudo tee -a /etc/fstab" \ - "enabling /tmp in RAM by modifying /etc/fstab" - if (whiptail --title "/tmp in RAM - Reboot" --yesno "Reboot required, proceed now ?" 10 60) then - sudo reboot - fi -} - -# -# add screenfetch exec in .bashrc -# -function addScreenfetchBashrc () { - checkAndInstallDep apt screenfetch screenfetch - runCmd "touch /home/$myHomedir/.bashrc" \ - "creating .bashrc file if necessary" \ - runCmd "echo 'screenfetch -t' | tee -a /home/$myHomedir/.bashrc" \ - "adding screenfetch to .bashrc" -} - -# -# cli history cmd timestamp enable -# -function enableHistoryTS () { - typeset ret_code - printf "enabling CLI History TimeStamp " - echo "export HISTTIMEFORMAT='%F %T '" | tee -a /home/$myHomedir/.bashrc &>> $logFile - ret_code=$? - retCode $ret_code -} - -# -# install/enable auto install of security updates -# -function installUnattendedUpgrades () { - installPackage apt unattended-upgrades -} - -# -# display useful system/hardware informations -# -function toolInxi () { - checkAndInstallDep apt inxi inxi \ - && inxi -F -} - -# -# check bandwith and latency of the internet connection -# -function toolSpeedtestCli () { - checkAndInstallDep pip speedtest-cli speedtest-cli \ - && speedtest-cli -} - -# -# check for packet loss -# -function toolPacketLoss () { - ping -q -c 10 google.com -} - -# -# Optimization of SQLite databases of Firefox and Firefox Nightly -# -function toolOptimizeFirefox () { - if (whiptail --title "Firefox SQLite DB Optimization" --yesno "Terminate Firefox and proceed ?" 10 60) then - if which firefox >/dev/null; then - printf "Optimizing Firefox" - pkill -9 firefox - for f in ~/.mozilla/firefox/*/*.sqlite; do sqlite3 $f 'VACUUM; REINDEX;'; done - printf "\n" - fi - if which firefox-trunk >/dev/null; then - printf "Optimizing Firefox Nightly" - pkill -9 firefox-trunk - for f in ~/.mozilla/firefox-trunk/*/*.sqlite; do sqlite3 $f 'VACUUM; REINDEX;'; done - printf "\n" - fi - fi -} - -# -# remove useless packages (depedencies) -# -function toolAutoremove () { - runCmd "sudo apt-get -y autoremove" \ - "removing not necessary dependencies" -} - -# -# remove old versions of installed kernels -# -function toolClearOldKernels () { - checkAndInstallDep apt ukuu ukuu \ - && runCmd "sudo ukuu --purge-old-kernels --yes" \ - "removing old kernels" -} - -# -# force soundcards detection -# -function toolSoundCardsDetection () { - runCmd "sudo alsa force-reload" \ - "detecting ALSA sound cards" -} \ No newline at end of file diff --git a/yggdrasil.sh b/yggdrasil.sh index 567ab97..976b536 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -14,24 +14,28 @@ dir=$(dirname $0) source /opt/yggdrasil/vars.sh OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` -if [[ $OS == *"Linux Mint 18"* ]]; then - source /opt/yggdrasil/core_functions_ub1604.sh - source /opt/yggdrasil/repo_functions_ub1604.sh - source /opt/yggdrasil/install_functions_ub1604.sh - source /opt/yggdrasil/menus_functions_ub1604.sh - source /opt/yggdrasil/tools_functions_ub1604.sh -elif [[ $OS == *"Ubuntu 18.04 LTS"* ]]; then - source /opt/yggdrasil/core_functions_ub1804.sh - source /opt/yggdrasil/repo_functions_ub1804.sh - source /opt/yggdrasil/install_functions_ub1804.sh - source /opt/yggdrasil/menus_functions_ub1804.sh - source /opt/yggdrasil/tools_functions_ub1804.sh -else - printf "\n" - printf $BOLDROUGE"Distribution non supportée/testée"$NORMAL - printf "\n\n" - exit -fi + +case $OS in + *"Ubuntu 18.04 LTS"* | *"Linux Mint 18"*) + source /opt/yggdrasil/core_functions_ub1604.sh + source /opt/yggdrasil/repo_functions_ub1604.sh + source /opt/yggdrasil/install_functions_ub1604.sh + source /opt/yggdrasil/menus_functions_ub1604.sh + source /opt/yggdrasil/tools_functions_ub1604.sh + ;; + *"Ubuntu 18.04 LTS"* | *"Linux Mint 19"*) + source /opt/yggdrasil/core_functions_ub1804.sh + source /opt/yggdrasil/repo_functions_ub1804.sh + source /opt/yggdrasil/install_functions_ub1804.sh + source /opt/yggdrasil/menus_functions_ub1804.sh + source /opt/yggdrasil/tools_functions_ub1804.sh + ;; + *) + printf "\n" + printf $BOLDROUGE"Distribution non supportée/testée"$NORMAL + printf "\n\n" + ;; +esac # # check if the script is running in root/sudo From 743bddd14559ba8033db20be9fc5291b59f0962b Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 00:59:21 +0200 Subject: [PATCH 019/261] some changes about source files structure --- yggdrasil.sh | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/yggdrasil.sh b/yggdrasil.sh index 976b536..4303c11 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -12,23 +12,20 @@ # dir=$(dirname $0) source /opt/yggdrasil/vars.sh +source /opt/yggdrasil/core_functions.sh +source /opt/yggdrasil/tools_functions.sh OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` - case $OS in *"Ubuntu 18.04 LTS"* | *"Linux Mint 18"*) - source /opt/yggdrasil/core_functions_ub1604.sh source /opt/yggdrasil/repo_functions_ub1604.sh source /opt/yggdrasil/install_functions_ub1604.sh source /opt/yggdrasil/menus_functions_ub1604.sh - source /opt/yggdrasil/tools_functions_ub1604.sh ;; *"Ubuntu 18.04 LTS"* | *"Linux Mint 19"*) - source /opt/yggdrasil/core_functions_ub1804.sh source /opt/yggdrasil/repo_functions_ub1804.sh source /opt/yggdrasil/install_functions_ub1804.sh source /opt/yggdrasil/menus_functions_ub1804.sh - source /opt/yggdrasil/tools_functions_ub1804.sh ;; *) printf "\n" From 3c73877d539b0f8cde8c721fec1c1bde865a4be1 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 01:07:39 +0200 Subject: [PATCH 020/261] nvidia drivers fix --- install_functions_ub1804.sh | 60 ++----------------------------------- menus_functions_ub1804.sh | 16 ---------- repo_functions_ub1804.sh | 22 +++----------- 3 files changed, 6 insertions(+), 92 deletions(-) diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index c2ed85a..8a89169 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -446,62 +446,6 @@ function installOibafMenu () { addRepo_Oibaf } -# -# install Nvidia Drivers (headless) -# -function installNvidia370 () { - installAppsFromList nvidia-370 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia370Menu () { - installAppsFromListMenu nvidia-370 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia375 () { - installAppsFromList nvidia-375 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia375Menu () { - installAppsFromListMenu nvidia-375 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia378 () { - installAppsFromList nvidia-378 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia378Menu () { - installAppsFromListMenu nvidia-378 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia381 () { - installAppsFromList nvidia-381 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia381Menu () { - installAppsFromListMenu nvidia-381 -} - # # install Nvidia Drivers (headless) # @@ -548,14 +492,14 @@ function installNvidia390Menu () { # install Nvidia Drivers (headless) # function installNvidia396 () { - installAppsFromList nvidia-396 + installAppsFromList nvidia-driver-396 } # # install Nvidia Drivers (Menu) # function installNvidia396Menu () { - installAppsFromListMenu nvidia-396 + installAppsFromListMenu nvidia-driver-396 } # diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index b898a6a..1bb5305 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -410,10 +410,6 @@ function showHardwareMenu () { "webcam" "Install webcam neede apps" \ "microcode" "Update Intel/AMD CPU microcode" \ "oibaf" "latest version of free graphic drivers, mesa, ..." \ - "nvidia370" "Install Nvidia 370 graphic drivers" \ - "nvidia375" "Install Nvidia 375 graphic drivers" \ - "nvidia378" "Install Nvidia 378 graphic drivers" \ - "nvidia381" "Install Nvidia 381 graphic drivers" \ "nvidia384" "Install Nvidia 384 graphic drivers" \ "nvidia387" "Install Nvidia 387 graphic drivers" \ "nvidia390" "Install Nvidia 390 graphic drivers" \ @@ -439,18 +435,6 @@ function showHardwareMenu () { "oibaf") installOibafMenu ;; - "nvidia370") - installNvidia370Menu - ;; - "nvidia375") - installNvidia375Menu - ;; - "nvidia378") - installNvidia378Menu - ;; - "nvidia381") - installNvidia381Menu - ;; "nvidia384") installNvidia384Menu ;; diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index a6aa750..1201b87 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -322,20 +322,6 @@ pcsc-tools;apt;cardreader;pcsc-tools libacr38u;apt;cardreader;libacr38u guvcview;apt;webcam;guvcview cheese;apt;webcam;cheese -nvidia-370;apt;nvidia-370;nvidia-370 -nvidia-settings;apt;nvidia-370;nvidia-settings -nvidia-opencl-icd-370;apt;nvidia-370;nvidia-opencl-icd-370 -nvidia-375;apt;nvidia-375;nvidia-375 -nvidia-settings;apt;nvidia-375;nvidia-settings -nvidia-opencl-icd-375;apt;nvidia-375;nvidia-opencl-icd-375 -nvidia-378;apt;nvidia-378;nvidia-378 -nvidia-settings;apt;nvidia-378;nvidia-settings -nvidia-opencl-icd-378;apt;nvidia-378;nvidia-opencl-icd-378 -libcuda1-378;apt;nvidia-378;libcuda1-378 -nvidia-381;apt;nvidia-381;nvidia-381 -nvidia-settings;apt;nvidia-381;nvidia-settings -nvidia-opencl-icd-381;apt;nvidia-381;nvidia-opencl-icd-381 -libcuda1-381;apt;nvidia-381;libcuda1-381 nvidia-384;apt;nvidia-384;nvidia-384 nvidia-settings;apt;nvidia-384;nvidia-settings nvidia-opencl-icd-384;apt;nvidia-384;nvidia-opencl-icd-384 @@ -347,11 +333,11 @@ libcuda1-387;apt;nvidia-387;libcuda1-387 nvidia-390;apt;nvidia-390;nvidia-390 nvidia-settings;apt;nvidia-390;nvidia-settings nvidia-opencl-icd-390;apt;nvidia-390;nvidia-opencl-icd-390 +nvidia-utils-390;apt;nvidia-390;nvidia-utils-390 libcuda1-390;apt;nvidia-390;libcuda1-390 -nvidia-396;apt;nvidia-396;nvidia-396 -nvidia-settings;apt;nvidia-396;nvidia-settings -nvidia-opencl-icd-396;apt;nvidia-396;nvidia-opencl-icd-396 -libcuda1-396;apt;nvidia-396;libcuda1-396 +nvidia-driver-396;apt;nvidia-driver-396;nvidia-driver-396 +nvidia-settings;apt;nvidia-driver-396;nvidia-settings +nvidia-utils-396;apt;nvidia-driver-396;nvidia-utils-396 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq agave;apt;dev;agave From 986d3a341a9e461b066b4560e3ea36dc0f0b3b27 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 01:24:41 +0200 Subject: [PATCH 021/261] noobslab/ravefinity icons/themes removed - updated (anymore ?) --- repo_functions_ub1804.sh | 43 ---------------------------------------- 1 file changed, 43 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 1201b87..bfef1a1 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -313,7 +313,6 @@ faenza-icon-theme;apt;icons;faenza-icon-theme faience-icon-theme;apt;icons;faience-icon-theme vibrantly-simple-icon-theme;apt;icons;vibrantly-simple-icon-theme rave-x-colors-icons;apt;icons;rave-x-colors-icons -ravefinity-x-icons;apt;icons;ravefinity-x-icons numix-icon-theme;apt;icons;numix-icon-theme numix-icon-theme-circle;apt;icons;numix-icon-theme-circle solaar;apt;solaar;solaar @@ -483,27 +482,6 @@ gimp-gmic;addRepo_Gimp gimp;addRepo_Gimp geary;addRepo_Geary vidcutter;addRepo_Vidcutter -ambiance-crunchy;addRepo_NoobslabThemes -arc-theme;addRepo_NoobslabThemes -ambiance-colors;addRepo_Ravefinity -radiance-colors;addRepo_Ravefinity -ambiance-flat-colors;addRepo_Ravefinity -vivacious-colors-gtk-dark;addRepo_Ravefinity -vivacious-colors-gtk-light;addRepo_Ravefinity -yosembiance-gtk-theme;addRepo_NoobslabThemes -ambiance-blackout-colors;addRepo_Ravefinity -ambiance-blackout-flat-colors;addRepo_Ravefinity -radiance-flat-colors;addRepo_Ravefinity -vibrancy-colors;addRepo_Ravefinity -vivacious-colors;addRepo_NoobslabThemes -arc-icons;addRepo_NoobslabIcons -ultra-flat-icons;addRepo_NoobslabIcons -myelementary;addRepo_NoobslabIcons -ghost-flat-icons;addRepo_NoobslabIcons -faenza-icon-theme;addRepo_NoobslabIcons -vibrantly-simple-icon-theme;addRepo_Ravefinity -rave-x-colors-icons;addRepo_Ravefinity -ravefinity-x-icons;addRepo_Ravefinity oracle-java10-installer;addRepo_Java10 oracle-java10-set-default;addRepo_Java10 green-recorder;addRepo_GreenRecorder @@ -664,13 +642,6 @@ function addRepo_Numix () { addPPA ppa:numix/ppa } -# -# ravefinity themes -# -function addRepo_Ravefinity () { - addPPA ppa:ravefinity-project/ppa -} - # # VLC # @@ -727,20 +698,6 @@ function addRepo_Java10 () { addPPA ppa:linuxuprising/java } -# -# Noobslab icons -# -function addRepo_NoobslabIcons () { - addPPA ppa:noobslab/icons -} - -# -# Noobslab themes -# -function addRepo_NoobslabThemes () { - addPPA ppa:noobslab/themes -} - # # Vidcutter # From 2725277239b177cc8c574ff9744689d0f725a0bb Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 01:32:59 +0200 Subject: [PATCH 022/261] noobslab/ravefinity icons/themes removed - updated (anymore ?) --- repo_functions_ub1804.sh | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index bfef1a1..2a1ff90 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -291,28 +291,10 @@ pidgin-hangouts;apt;pidgin;pidgin-hangouts pidgin-skypeweb;apt;pidgin;pidgin-skypeweb purple-skypeweb;apt;pidgin;purple-skypeweb unbound;apt;unbound;unbound -ambiance-crunchy;apt;gtkthemes;ambiance-crunchy arc-theme;apt;gtkthemes;arc-theme -ambiance-colors;apt;gtkthemes;ambiance-colors -radiance-colors;apt;gtkthemes;radiance-colors -ambiance-flat-colors;apt;gtkthemes;ambiance-flat-colors -vivacious-colors-gtk-dark;apt;gtkthemes;vivacious-colors-gtk-dark -vivacious-colors-gtk-light;apt;gtkthemes;vivacious-colors-gtk-light -yosembiance-gtk-theme;apt;gtkthemes;yosembiance-gtk-theme -ambiance-blackout-colors;apt;gtkthemes;ambiance-blackout-colors -ambiance-blackout-flat-colors;apt;gtkthemes;ambiance-blackout-flat-colors -radiance-flat-colors;apt;gtkthemes;radiance-flat-colors -vibrancy-colors;apt;gtkthemes;vibrancy-colors -vivacious-colors;apt;gtkthemes;vivacious-colors numix-gtk-theme;apt;gtkthemes;numix-gtk-theme arc-icons;apt;icons;arc-icons -ultra-flat-icons;apt;icons;ultra-flat-icons -myelementary;apt;icons;myelementary -ghost-flat-icons;apt;icons;ghost-flat-icons faenza-icon-theme;apt;icons;faenza-icon-theme -faience-icon-theme;apt;icons;faience-icon-theme -vibrantly-simple-icon-theme;apt;icons;vibrantly-simple-icon-theme -rave-x-colors-icons;apt;icons;rave-x-colors-icons numix-icon-theme;apt;icons;numix-icon-theme numix-icon-theme-circle;apt;icons;numix-icon-theme-circle solaar;apt;solaar;solaar From b55d9750ed9358c10eb2d1f72b8186e08179342f Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 01:38:04 +0200 Subject: [PATCH 023/261] lightdm fct bug bix --- tools_functions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/tools_functions.sh b/tools_functions.sh index 427b696..219fb5f 100644 --- a/tools_functions.sh +++ b/tools_functions.sh @@ -35,6 +35,8 @@ function enableUFW () { function enableNumLockX () { checkAndInstallDep apt numlockx numlockx if which lightdm >/dev/null; then + runCmd "sudo touch /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \ + "creating lightdm config file if necessary" runCmd "sudo cp /etc/lightdm/lightdm.conf.d/70-linuxmint.conf /etc/lightdm/lightdm.conf.d/70-linuxmint.conf.yggbak" \ "backing up lightdm original config file" runCmd "echo -e '\ngreeter-setup-script=/usr/bin/numlockx on' | sudo tee -a /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \ From 206a801339bee7eb208e23305bdfe151df632ae9 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 01:41:44 +0200 Subject: [PATCH 024/261] microcode cpu upd fct bug fixed --- install_functions_ub1804.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 8a89169..04af22b 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -394,15 +394,16 @@ function updateMicrocode () { intel=`cat /proc/cpuinfo | grep -i Intel | wc -l` amd=`cat /proc/cpuinfo | grep -i Amd | wc -l` if [ "$intel" -gt "0" ]; then - printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" installPackage apt intel-microcode + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` + printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" elif [ "$amd" -gt "0" ]; then installPackage apt amd64-microcode + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" else printf "[INFO] No Intel/AMD CPU found" fi - newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` printf "\n" } From dfc3f9596087e6f4ea47d397f7df403323ad615b Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 01:50:21 +0200 Subject: [PATCH 025/261] Rhythmbox PPA removed + not upd plugins removed --- repo_functions_ub1804.sh | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 2a1ff90..ef571b6 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -256,8 +256,6 @@ rhythmbox-plugin-artdisplay;apt;rhythmbox;rhythmbox-plugin-artdisplay rhythmbox-plugin-cdrecorder;apt;rhythmbox;rhythmbox-plugin-cdrecorder rhythmbox-plugin-close-on-hide;apt;rhythmbox;rhythmbox-plugin-close-on-hide rhythmbox-plugin-countdown-playlist;apt;rhythmbox;rhythmbox-plugin-countdown-playlist -rhythmbox-plugin-coverart-browser;apt;rhythmbox;rhythmbox-plugin-coverart-browser -rhythmbox-plugin-coverart-search;apt;rhythmbox;rhythmbox-pluginn-coverart-search rhythmbox-plugin-desktopart;apt;rhythmbox;rhythmbox-plugin-desktopart rhythmbox-plugin-equalizer;apt;rhythmbox;rhythmbox-plugin-equalizer rhythmbox-plugin-fileorganizer;apt;rhythmbox;rhythmbox-plugin-fileorganizer @@ -279,8 +277,6 @@ rhythmbox-plugin-screensaver;apt;rhythmbox;rhythmbox-plugin-screensaver rhythmbox-plugin-smallwindow;apt;rhythmbox;rhythmbox-plugin-smallwindow rhythmbox-plugin-spectrum;apt;rhythmbox;rhythmbox-plugin-spectrum rhythmbox-plugin-suspend;apt;rhythmbox;rhythmbox-plugin-suspend -rhythmbox-plugin-tray-icon;apt;rhythmbox;rhythmbox-plugin-tray-icon -rhythmbox-plugin-visualizer;apt;rhythmbox;rhythmbox-plugin-visualizer rhythmbox-plugin-wikipedia;apt;rhythmbox;rhythmbox-plugin-wikipedia rhythmbox-plugins;apt;rhythmbox;rhythmbox-plugins telegram-purple;apt;pidgin;telegram-purple @@ -483,8 +479,6 @@ rhythmbox-plugin-artdisplay;addRepo_Rhythmbox rhythmbox-plugin-cdrecorder;addRepo_Rhythmbox rhythmbox-plugin-close-on-hide;addRepo_Rhythmbox rhythmbox-plugin-countdown-playlist;addRepo_Rhythmbox -rhythmbox-plugin-coverart-browser;addRepo_Rhythmbox -rhythmbox-plugin-coverart-search;addRepo_Rhythmbox rhythmbox-plugin-desktopart;addRepo_Rhythmbox rhythmbox-plugin-equalizer;addRepo_Rhythmbox rhythmbox-plugin-fileorganizer;addRepo_Rhythmbox @@ -506,8 +500,6 @@ rhythmbox-plugin-screensaver;addRepo_Rhythmbox rhythmbox-plugin-smallwindow;addRepo_Rhythmbox rhythmbox-plugin-spectrum;addRepo_Rhythmbox rhythmbox-plugin-suspend;addRepo_Rhythmbox -rhythmbox-plugin-tray-icon;addRepo_Rhythmbox -rhythmbox-plugin-visualizer;addRepo_Rhythmbox rhythmbox-plugin-wikipedia;addRepo_Rhythmbox rhythmbox-plugins;addRepo_Rhythmbox vulkan-utils;addRepo_NvidiaDrivers @@ -613,7 +605,7 @@ function addRepo_NvidiaDrivers () { # Rhythmbox # function addRepo_Rhythmbox () { - addPPA ppa:fossfreedom/rhythmbox + #addPPA ppa:fossfreedom/rhythmbox addPPA ppa:fossfreedom/rhythmbox-plugins } From 712c540c16f9f7c275a3eb1a79621a804581c087 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 01:51:27 +0200 Subject: [PATCH 026/261] small bug office --- repo_functions_ub1804.sh | 1 - yggdrasil.sh | 2 -- 2 files changed, 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index ef571b6..e4ad1ae 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -605,7 +605,6 @@ function addRepo_NvidiaDrivers () { # Rhythmbox # function addRepo_Rhythmbox () { - #addPPA ppa:fossfreedom/rhythmbox addPPA ppa:fossfreedom/rhythmbox-plugins } diff --git a/yggdrasil.sh b/yggdrasil.sh index 4303c11..c14063c 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -76,7 +76,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installMiscUtilities installMultimedia installNetTools - installOffice installWine installCajaPlugins installNautilusAndPlugins @@ -116,7 +115,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installMiscUtilities installMultimedia installNetTools - installOffice installWine installCajaPlugins installNautilusAndPlugins From 3c3d972839d88a62a4380c6395cb4ca92df35c72 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 01:57:22 +0200 Subject: [PATCH 027/261] wine install fixed --- repo_functions_ub1804.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index e4ad1ae..79e5574 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -377,7 +377,7 @@ nitrogen;apt;nitrogen;nitrogen firefox-trunk;apt;nightly;firefox-trunk firefox-trunk-locale-fr;apt;nightly;firefox-trunk-locale-fr libreoffice;apt;office;libreoffice6 -winehq-devel;apt;wine;winehq-devel +wine-development;apt;wine;wine-development winetricks;apt;wine;winetricks playonlinux;apt;wine;playonlinux mongodb-org;apt;mongodb;mongodb From 19517902e5967e41a33fbaa6f953de94a74afb69 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 02:10:54 +0200 Subject: [PATCH 028/261] bunch of bug fixed --- repo_functions_ub1604.sh | 3 +++ repo_functions_ub1804.sh | 23 ++++------------------- 2 files changed, 7 insertions(+), 19 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 5b9ae0d..b53739e 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -225,6 +225,7 @@ caja-image-converter;apt;cajaplugins;caja-image-converter insync-caja;apt;cajaplugins;insync-caja nautilus;apt;nautilus;nautilus file-roller;apt;nautilus;file-roller +nautilus-terminal;apt;nautilus;nautilus-terminal nautilus-emblems;apt;nautilus;nautilus-emblems nautilus-image-manipulator;apt;nautilus;nautilus-image-manipulator nautilus-image-converter;apt;nautilus;nautilus-image-converter @@ -600,6 +601,8 @@ nautilus-columns;addRepo_Webupd8 nautilus-terminal;addRepo_Webupd8 purple-hangouts;addRepo_Webupd8 purple-skypeweb;addRepo_Webupd8 +pidgin-hangouts;addRepo_Webupd8 +pidgin-skypeweb;addRepo_Webupd8 qt5ct;addRepo_Webupd8 syncthing-gtk;addRepo_Webupd8 telegram-purple;addRepo_Webupd8 diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 79e5574..4b04272 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -121,7 +121,6 @@ xchat-gnome;apt;internet;xchat-gnome xchat-gnome-indicator;apt;internet;xchat-gnome-indicator chromium-browser;apt;internet;chromium-browser chromium-browser-l10n;apt;internet;chromium-browser-l10n -nautilus-dropbox;apt;internet;nautilus-dropbox filezilla;apt;internet;filezilla hexchat;apt;internet;hexchat mumble;apt;internet;mumble @@ -226,10 +225,8 @@ insync-caja;apt;cajaplugins;insync-caja nautilus;apt;nautilus;nautilus file-roller;apt;nautilus;file-roller nautilus-emblems;apt;nautilus;nautilus-emblems -nautilus-image-manipulator;apt;nautilus;nautilus-image-manipulator nautilus-image-converter;apt;nautilus;nautilus-image-converter nautilus-compare;apt;nautilus;nautilus-compare -nautilus-actions;apt;nautilus;nautilus-actions nautilus-sendto;apt;nautilus;nautilus-sendto nautilus-share;apt;nautilus;nautilus-share nautilus-wipe;apt;nautilus;nautilus-wipe @@ -250,7 +247,6 @@ gimp-lensfun;apt;gimp;gimp-lensfun gimp-gmic;apt;gimp;gimp-gmic gimp-ufraw;apt;gimp;gimp-ufraw gimp-texturize;apt;gimp;gimp-texturize -gimp-plugin-registry;apt;gimp;gimp-plugin-registry rhythmbox-plugin-alternative-toolbar;apt;rhythmbox;rhythmbox-plugin-alternative-toolbar rhythmbox-plugin-artdisplay;apt;rhythmbox;rhythmbox-plugin-artdisplay rhythmbox-plugin-cdrecorder;apt;rhythmbox;rhythmbox-plugin-cdrecorder @@ -279,13 +275,8 @@ rhythmbox-plugin-spectrum;apt;rhythmbox;rhythmbox-plugin-spectrum rhythmbox-plugin-suspend;apt;rhythmbox;rhythmbox-plugin-suspend rhythmbox-plugin-wikipedia;apt;rhythmbox;rhythmbox-plugin-wikipedia rhythmbox-plugins;apt;rhythmbox;rhythmbox-plugins -telegram-purple;apt;pidgin;telegram-purple pidgin-skype;apt;pidgin;pidgin-skype purple-facebook;apt;pidgin;purple-facebook -purple-hangouts;apt;pidgin;purple-hangouts -pidgin-hangouts;apt;pidgin;pidgin-hangouts -pidgin-skypeweb;apt;pidgin;pidgin-skypeweb -purple-skypeweb;apt;pidgin;purple-skypeweb unbound;apt;unbound;unbound arc-theme;apt;gtkthemes;arc-theme numix-gtk-theme;apt;gtkthemes;numix-gtk-theme @@ -404,7 +395,6 @@ intellij-idea-community;snap;idea;idea" AppsRepo="kodi-beta;addRepo_KodiBeta kodi-nightly;addRepo_KodiNightly libreoffice6;addRepo_Libreoffice6 -winehq-devel;addRepo_Wine mongodb;addRepo_MongoDB3CE gyazo;addRepo_Gyazo code;addRepo_VSCode @@ -534,13 +524,8 @@ cpu-g;addRepo_Atareao gqrcode;addRepo_Atareao imagedownloader;addRepo_Atareao audacious;addRepo_Webupd8 -nautilus-columns;addRepo_Webupd8 -nautilus-terminal;addRepo_Webupd8 -purple-hangouts;addRepo_Webupd8 -purple-skypeweb;addRepo_Webupd8 qt5ct;addRepo_Webupd8 syncthing-gtk;addRepo_Webupd8 -telegram-purple;addRepo_Webupd8 screenkey;addRepo_Webupd8 yad;addRepo_Webupd8 woeusb;addRepo_Webupd8" @@ -1045,10 +1030,10 @@ function addRepo_MongoDB3CE () { # # Wine Build # -function addRepo_Wine () { - addKey "https://dl.winehq.org/wine-builds/Release.key" - addRepo "winehq.list" \ - "deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main" +# function addRepo_Wine () { +# addKey "https://dl.winehq.org/wine-builds/Release.key" +# addRepo "winehq.list" \ +# "deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main" } # From 169ba609a57c6cef0d94e2e9f5e1f7555a2016f5 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 02:12:07 +0200 Subject: [PATCH 029/261] java10 --- yggdrasil.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/yggdrasil.sh b/yggdrasil.sh index c14063c..99bcae9 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -72,7 +72,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installGames installSteam installInternet - installJava9 + installJava10 installMiscUtilities installMultimedia installNetTools @@ -111,7 +111,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installGames installSteam installInternet - installJava9 + installJava10 installMiscUtilities installMultimedia installNetTools From 8a9f8d0136411d483bf9b222d144d24eaeec61b1 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 02:24:25 +0200 Subject: [PATCH 030/261] headless steam fct upd --- install_functions_ub1604.sh | 9 ++++++--- install_functions_ub1804.sh | 18 ++++++------------ 2 files changed, 12 insertions(+), 15 deletions(-) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index c1212a8..25079ed 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -166,9 +166,12 @@ function installGamesMenu () { # Steam (headless) # function installSteam () { - runCmd "echo steam steam/purge \"note\" | sudo debconf-set-selections \"accepting steam licence\"" - runCmd "echo steam steam/license \"note\" | sudo debconf-set-selections \"accepting steam licence 2/3\"" - runCmd "echo steam steam/question select \"I AGREE\" | sudo debconf-set-selections \"accepting steam licence 3/3\"" + runCmd "echo \"steam steam/purge note\" | sudo debconf-set-selections" \ + "accepting steam licence" + runCmd "echo \"steam steam/license note\" | sudo debconf-set-selections" \ + "accepting steam licence 2/3" + runCmd "echo \"steam steam/question select I AGREE\" | sudo debconf-set-selections" \ + "accepting steam licence 3/3" installPackage apt steam } diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 04af22b..c7cbe64 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -172,9 +172,12 @@ function installGamesMenu () { # Steam (headless) # function installSteam () { - runCmd "echo steam steam/purge \"note\" | sudo debconf-set-selections \"accepting steam licence\"" - runCmd "echo steam steam/license \"note\" | sudo debconf-set-selections \"accepting steam licence 2/3\"" - runCmd "echo steam steam/question select \"I AGREE\" | sudo debconf-set-selections \"accepting steam licence 3/3\"" + runCmd "echo \"steam steam/purge note\" | sudo debconf-set-selections" \ + "accepting steam licence" + runCmd "echo \"steam steam/license note\" | sudo debconf-set-selections" \ + "accepting steam licence 2/3" + runCmd "echo \"steam steam/question select I AGREE\" | sudo debconf-set-selections" \ + "accepting steam licence 3/3" installPackage apt steam } @@ -662,15 +665,6 @@ function installRubyMenu () { installAppsFromListMenu ruby } -#TODO: -function installAndroidEnv () { - msg="Installing Android environment" - - runCmd "touch /home/$myHomedir/.bashrc" \ - "creating .bashrc file if necessary" - sh -c "echo '\n\nexport PATH=${PATH}:/home/'$myHomedir'/Android/Sdk/tools:/home/'$myHomedir'/Android/Sdk/platform-tools' >> /home/$myHomedir/.bashrc" -} - # # install Atom App (headless) # From e18ebfeb94b6cfc34f75c0b82722b51dc19ff295 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 02:33:16 +0200 Subject: [PATCH 031/261] tmsu removed as no repo available --- repo_functions_ub1804.sh | 9 --------- 1 file changed, 9 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 4b04272..c5d56fe 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -180,7 +180,6 @@ cheat;pip;utilities;cheat mate-sensors-applet-nvidia;apt;utilities;mate-sensors-applets-nvidia woeusb;apt;utilities;woeusb screenkey;apt;utilities;screenkey -tmsu;apt;utilities;tmsu etcher-electron;apt;utilities;etcher-electron pdfgrep;apt;utilities;pdfgrep coinmon;npm;utilities;coinmon @@ -427,7 +426,6 @@ aptik;addRepo_Teejee2008 conky-manager;addRepo_Teejee2008 avidemux2.6-plugins-qt;addRepo_Avidemux2.6 avidemux2.6-qt;addRepo_Avidemux2.6 -tmsu;addRepo_Tmsu quiterss;addRepo_Quiterss transmission-gtk;addRepo_Transmissionbt handbrake;addRepo_Handbrake @@ -797,13 +795,6 @@ function addRepo_Quiterss () { addPPA ppa:quiterss/quiterss } -# -# TMSU -# -function addRepo_Tmsu () { - addPPA ppa:tmsu/ppa -} - # # Avidemux # From 0b02f5a9ed9a7adbade1d5a7b64401fdbb581422 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 14:17:50 +0200 Subject: [PATCH 032/261] many changes for 18.04 --- repo_functions_ub1604.sh | 1 + repo_functions_ub1804.sh | 3 --- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index b53739e..81a0ba2 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -473,6 +473,7 @@ sqlitebrowser;addRepo_SQLiteBrowser ukuu;addRepo_Teejee2008 aptik;addRepo_Teejee2008 conky-manager;addRepo_Teejee2008 +selene;addRepo_Teejee2008 avidemux2.6-plugins-qt;addRepo_Avidemux2.6 avidemux2.6-qt;addRepo_Avidemux2.6 tmsu;addRepo_Tmsu diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index c5d56fe..3af756e 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -50,8 +50,6 @@ dia;apt;multimedia;dia mpv;apt;multimedia;mpv picard;apt;multimedia;picard inkscape;apt;multimedia;inkscape -aegisub;apt;multimedia;aegisub -aegisub-l10n;apt;multimedia;aegisub-l10n mypaint;apt;multimedia;mypaint mypaint-data-extras;apt;multimedia;mypaint-data-extras audacity;apt;multimedia;audacity @@ -70,7 +68,6 @@ openshot;apt;multimedia;openshot smplayer;apt;multimedia;smplayer smplayer-themes;apt;multimedia;smplayer-themes smplayer-l10n;apt;multimedia;smplayer-l10n -selene;apt;multimedia;selene gnome-mplayer;apt;multimedia;gnome-mplayer handbrake;apt;multimedia;handbrake avidemux2.6-qt;apt;multimedia;avidemux2.6-qt From 8846acf8ffcffac8a210492492b9acc5bb0cdea4 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 15:18:46 +0200 Subject: [PATCH 033/261] many changes for 18.04 --- install_functions_ub1804.sh | 18 +++++++++ repo_functions_ub1604.sh | 1 - repo_functions_ub1804.sh | 80 +------------------------------------ yggdrasil.sh | 2 + 4 files changed, 21 insertions(+), 80 deletions(-) diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index c7cbe64..04681d6 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -126,6 +126,24 @@ function installFranzMenu () { yes } +# +# XnViewMP (headless) +# +function installXnViewMP () { + installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ + xnviewmp.deb \ + no +} + +# +# XnViewMP (Menu) +# +function installXnViewMP () { + installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ + xnviewmp.deb \ + yes +} + # # install Misc Utilities Apps (headless) # diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 81a0ba2..7e26b2d 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -62,7 +62,6 @@ synfigstudio;apt;multimedia;synfigstudio mkvtoolnix-gui;apt;multimedia;mkvtoolnix-gui rawtherapee;apt;multimedia;rawtherapee hugin;apt;multimedia;hugin -xnview;apt;multimedia;xnview asunder;apt;multimedia;asunder milkytracker;apt;multimedia;milkytracker pitivi;apt;multimedia;pitivi diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 3af756e..6011578 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -40,11 +40,9 @@ idle3-tools;apt;base;idle3-tools snapd;apt;base;snapd sysstat;apt;base;sysstat spotify;snap;multimedia;spotify -slowmovideo;apt;multimedia;slowmovideo sayonara;apt;multimedia;sayonara qmmp;apt;multimedia;qmmp qmmp-plugin-projectm;apt;multimedia;qmmp-plugin-projectm -shotcut;apt;multimedia;shotcut audacious;apt;multimedia;audacious dia;apt;multimedia;dia mpv;apt;multimedia;mpv @@ -60,7 +58,6 @@ synfigstudio;apt;multimedia;synfigstudio mkvtoolnix-gui;apt;multimedia;mkvtoolnix-gui rawtherapee;apt;multimedia;rawtherapee hugin;apt;multimedia;hugin -xnview;apt;multimedia;xnview asunder;apt;multimedia;asunder milkytracker;apt;multimedia;milkytracker pitivi;apt;multimedia;pitivi @@ -68,7 +65,6 @@ openshot;apt;multimedia;openshot smplayer;apt;multimedia;smplayer smplayer-themes;apt;multimedia;smplayer-themes smplayer-l10n;apt;multimedia;smplayer-l10n -gnome-mplayer;apt;multimedia;gnome-mplayer handbrake;apt;multimedia;handbrake avidemux2.6-qt;apt;multimedia;avidemux2.6-qt avidemux2.6-plugins-qt;apt;multimedia;avidemux2.6-plugins-qt @@ -107,23 +103,17 @@ gmusicbrowser;apt;multimedia;gmusicbrowser peek;apt;multimedia;peek bino;apt;multimedia;bino owncloud-client;apt;internet;owncloud-client -syncthing-gtk;apt;internet;syncthing-gtk syncthing;apt;internet;syncthing insync;apt;internet;insync discord;snap;internet;discord quiterss;apt;internet;quiterss opera-stable;apt;internet;opera-stable google-chrome-stable;apt;internet;google-chrome-stable -xchat-gnome;apt;internet;xchat-gnome -xchat-gnome-indicator;apt;internet;xchat-gnome-indicator chromium-browser;apt;internet;chromium-browser chromium-browser-l10n;apt;internet;chromium-browser-l10n filezilla;apt;internet;filezilla hexchat;apt;internet;hexchat mumble;apt;internet;mumble -imagedownloader;apt;internet;imagedownloader -california;apt;internet;california -midori;apt;internet;midori geary;apt;internet;geary corebird;apt;internet;corebird telegram;apt;internet;telegram @@ -135,11 +125,8 @@ deluge-torrent;apt;internet;deluge-torrent vivaldi-stable;apt;internet;vivaldi-stable transmission-gtk;apt;internet;transmission-gtk qtqr;apt;utilities;qtqr -gqrcode;apt;utilities;gqrcode -cpu-g;apt;utilities;cpu-g screenfetch;apt;utilities;screenfetch xcalib;apt;utilities;xcalib -conky-manager;apt;utilities;conky-manager conky-all;apt;utilities;conky-all plank;apt;utilities;plank indicator-sound-switcher;apt;utilities;indicator-sound-switcher @@ -158,10 +145,8 @@ aptik;apt;utilities;aptik gufw;apt;utilities;gufw numlockx;apt;utilities;numlockx grub-customizer;apt;utilities;grub-customizer -unetbootin;apt;utilities;unebootin zim;apt;utilities;zim diodon;apt;utilities;diodon -pyrenamer;apt;utilities;pyrenamer qt5ct;apt;utilities;qt5ct qt4-qtconfig;apt;utilities;qt4-qtconfig byobu;apt;utilities;byobu @@ -210,7 +195,6 @@ dsniff;apt;nettools;dsniff aircrack-ng;apt;nettools;aricrack-ng SpoofMAC;pip;nettools;SpoofMAC speedtest-cli;pip;nettools;speedtest-cli -whatportis;pip;nettools;whatportis nethogs;apt;nettools;nethogs ssh_scan;gem;nettools;sshscan caja-share;apt;cajaplugins;caja-share @@ -305,7 +289,6 @@ nvidia-utils-396;apt;nvidia-driver-396;nvidia-utils-396 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq agave;apt;dev;agave -utext;apt;dev;utext gpick;apt;dev;gpick virtualbox-5.2;apt;dev;virtualbox-5.2 build-essential;apt;dev;build-essential @@ -402,7 +385,7 @@ sublime-text;addRepo_SublimeText vivaldi-stable;addRepo_Vivaldi virtualbox-5.2;addRepo_VirtualBox owncloud-client;addRepo_OwnCloud -syncthing-gtk;addRepo_Syncthing +syncthing;addRepo_Syncthing opera-stable;addRepo_Opera insync;addRepo_Insync google-chrome-stable;addRepo_ChromeStable @@ -420,18 +403,14 @@ peek;addRepo_Peek sqlitebrowser;addRepo_SQLiteBrowser ukuu;addRepo_Teejee2008 aptik;addRepo_Teejee2008 -conky-manager;addRepo_Teejee2008 avidemux2.6-plugins-qt;addRepo_Avidemux2.6 avidemux2.6-qt;addRepo_Avidemux2.6 quiterss;addRepo_Quiterss transmission-gtk;addRepo_Transmissionbt handbrake;addRepo_Handbrake notepadqq;addRepo_Notepadqq -mumble;addRepo_Mumble -utext;addRepo_Utext flacon;addRepo_Flacon y-ppa-manager;addRepo_YPPAManager -shotcut;addRepo_Shotcut diodon;addRepo_Diodon sayonara;addRepo_Sayonara zeal;addRepo_Zeal @@ -448,14 +427,11 @@ vidcutter;addRepo_Vidcutter oracle-java10-installer;addRepo_Java10 oracle-java10-set-default;addRepo_Java10 green-recorder;addRepo_GreenRecorder -hugin;addRepo_Hugin simplescreenrecorder;addRepo_SimpleScreenRecorder simplescreenrecorder-lib;addRepo_SimpleScreenRecorder simplescreenrecorder-lib:i386;addRepo_SimpleScreenRecorder -slowmovideo;addRepo_Slowmovideo zim;addRepo_Zim grub-customizer;addRepo_GrubCustomizer -vlc;addRepo_VLC numix-gtk-theme;addRepo_Numix numix-icon-theme;addRepo_Numix numix-icon-theme-circle;addRepo_Numix @@ -487,7 +463,6 @@ rhythmbox-plugin-spectrum;addRepo_Rhythmbox rhythmbox-plugin-suspend;addRepo_Rhythmbox rhythmbox-plugin-wikipedia;addRepo_Rhythmbox rhythmbox-plugins;addRepo_Rhythmbox -vulkan-utils;addRepo_NvidiaDrivers nvidia-settings;addRepo_NvidiaDrivers nvidia-370;addRepo_NvidiaDrivers nvidia-opencl-icd-370;addRepo_NvidiaDrivers @@ -515,12 +490,8 @@ rawtherapee;addRepo_DhorMyWay entangle;addRepo_DhorMyWay mkvtoolnix-gui;addRepo_MKVToolnix purple-facebook;addRepo_Jgeboski -cpu-g;addRepo_Atareao -gqrcode;addRepo_Atareao -imagedownloader;addRepo_Atareao audacious;addRepo_Webupd8 qt5ct;addRepo_Webupd8 -syncthing-gtk;addRepo_Webupd8 screenkey;addRepo_Webupd8 yad;addRepo_Webupd8 woeusb;addRepo_Webupd8" @@ -532,13 +503,6 @@ function addRepo_Webupd8 () { addPPA ppa:nilarimogard/webupd8 } -# -# cpu-g, gqrcode, imagedownloader -# -function addRepo_Atareao () { - addPPA ppa:atareao/atareao -} - # # purple facebook # @@ -595,13 +559,6 @@ function addRepo_Numix () { addPPA ppa:numix/ppa } -# -# VLC -# -function addRepo_VLC () { - addPPA ppa:videolan/stable-daily -} - # # Grub-Customizer # @@ -616,13 +573,6 @@ function addRepo_Zim () { addPPA ppa:jaap.karssenberg/zim } -# -# Slowmovideo -# -function addRepo_Slowmovideo () { - addPPA ppa:ubuntuhandbook1/slowmovideo -} - # # Simple-Screen-Recorder # @@ -630,13 +580,6 @@ function addRepo_SimpleScreenRecorder () { addPPA ppa:maarten-baert/simplescreenrecorder } -# -# Hugin -# -function addRepo_Hugin () { - addPPA ppa:hugin/hugin-builds -} - # # Green-Recorder # @@ -729,13 +672,6 @@ function addRepo_Diodon () { addPPA ppa:diodon-team/stable } -# -# Shotcut -# -function addRepo_Shotcut () { - addPPA ppa:haraldhv/shotcut -} - # # Y-PPA-Manager # @@ -750,20 +686,6 @@ function addRepo_Flacon () { addPPA ppa:flacon/ppa } -# -# Utext -# -function addRepo_Utext () { - addPPA ppa:atareao/utext -} - -# -# Mumble -# -function addRepo_Mumble () { - addPPA ppa:mumble/release -} - # # Notepadqq # diff --git a/yggdrasil.sh b/yggdrasil.sh index 99bcae9..f70bd7b 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -95,6 +95,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installViber installFranz installTeamViewer13 + installXnViewMP toolAutoremove exit ;; @@ -139,6 +140,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installViber installFranz installTeamViewer13 + installXnViewMP toolAutoremove exit ;; From 306c6622090d6234809fae8fcc1c8d70d490a05c Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 15:26:04 +0200 Subject: [PATCH 034/261] . --- repo_functions_ub1604.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 7e26b2d..c244717 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -453,7 +453,7 @@ sublime-text;addRepo_SublimeText vivaldi-stable;addRepo_Vivaldi virtualbox-5.2;addRepo_VirtualBox owncloud-client;addRepo_OwnCloud -syncthing-gtk;addRepo_Syncthing +syncthing;addRepo_Syncthing opera-stable;addRepo_Opera insync;addRepo_Insync google-chrome-stable;addRepo_ChromeStable From eec24b3fd85c083f207afb882ff3de80ff046467 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 27 May 2018 16:32:39 +0200 Subject: [PATCH 035/261] some messages notif upd --- yggdrasil.sh | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) diff --git a/yggdrasil.sh b/yggdrasil.sh index f70bd7b..99c427e 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -145,62 +145,91 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do exit ;; c) # install themes and icons + msg "Initializing" yggInit + msg "Updating the system" updateSystem + msg "Installing Icons/Themes" installIcons installThemes exit ;; w) # nitrogen + msg "Initializing" yggInit + msg "Updating the system" updateSystem + msg "Installing Nitrogen" installNitrogen exit ;; d) # install Unbound DNS Cache + msg "Initializing" yggInit + msg "Updating the system" updateSystem + msg "Installing Unbound" installUnbound exit ;; q) # cardreader + msg "Initializing" yggInit + msg "Updating the system" updateSystem + msg "Installing Card Readers Apps" installCardReader exit ;; s) # solaar for logitech devices + msg "Initializing" yggInit + msg "Updating the system" updateSystem + msg "Installing Solaar" installSolaar exit ;; t) # tlp (laptop or low energy usage) + msg "Initializing" yggInit + msg "Updating the system" updateSystem + msg "Installing TLP" installTLP exit ;; n) # latest nvidia driver (see menus if need older version) + msg "Initializing" yggInit + msg "Updating the system" updateSystem + msg "Installing Nvidia Latest Driver" installNvidia396 exit ;; g) # latest feee graphic drivers, mesa, ... + msg "Initializing" yggInit + msg "Updating the system" updateSystem + msg "Installing Free Graphic Drivers" installOibaf exit ;; k) + msg "Initializing" yggInit + msg "Updating the system" updateSystem + msg "Updating Kernel" kernelUpdate exit ;; u) + msg "Initializing" yggInit + msg "Updating the system" updateSystem exit ;; From 9772f359750ab78205749b4faa3288a79248789d Mon Sep 17 00:00:00 2001 From: shakasan Date: Mon, 28 May 2018 14:03:27 +0200 Subject: [PATCH 036/261] PreTrtFct mechanism added and install fct adapted --- core_functions.sh | 33 ++++++++++------ install_functions_ub1604.sh | 22 +---------- install_functions_ub1804.sh | 22 +---------- repo_functions_ub1604.sh | 78 ++++++++++++++++++++++++++++++------- repo_functions_ub1804.sh | 76 +++++++++++++++++++++++++++++------- 5 files changed, 154 insertions(+), 77 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index b366252..82034d0 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -426,17 +426,26 @@ function addSpecificRepoFct () { # # find and execute Pre/Post install functions for a specific app -# input : unique ID +# input : unique ID, pre/post # function processAppTrtFct () { - for i in $AppsTrtFct; do - appTrtFct=(${i//;/ }) - if [ "${appTrtFct[0]}" == "$1" ]; then - printf "[TRT] package -- $1 -- " - printf "post install processed by -- ${appTrtFct[1]}\n" - eval "${appTrtFct[1]}" - fi - done + if [ "$2" == "post" ]; then + for i in $AppsPostTrtFct; do + appPostTrtFct=(${i//;/ }) + if [ "${appPostTrtFct[0]}" == "$1" ]; then + printf "[TRT][POST][$1][${appPostTrtFct[1]}]\n" + eval "${appPostTrtFct[1]}" + fi + done + else + for i in $AppsPreTrtFct; do + appPreTrtFct=(${i//;/ }) + if [ "${appPreTrtFct[0]}" == "$1" ]; then + printf "[TRT][PRE][$1][${appPreTrtFct[1]}]\n" + eval "${appPreTrtFct[1]}" + fi + done + fi } # @@ -459,8 +468,9 @@ function installAppsFromList () { for i in $Apps; do app=(${i//;/ }) if [ "${app[2]}" == "$1" ]; then + processAppTrtFct ${app[3]} post installPackage ${app[1]} ${app[0]} - processAppTrtFct ${app[3]} + processAppTrtFct ${app[3]} post fi done } @@ -503,8 +513,9 @@ function installAppsFromListMenu () { for i in $Apps; do app=(${i//;/ }) if [ "${app[3]}" == "${pkgToInstall//\"}" ]; then + processAppTrtFct ${app[3]} pre installPackage ${app[1]} ${app[0]} - processAppTrtFct ${app[3]} + processAppTrtFct ${app[3]} post fi done done diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index 25079ed..e0d0dd1 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -70,8 +70,6 @@ function installEbookMenu () { # install Internet Apps (headless) # function installInternet () { - runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \ - "setting as do not add repo" installAppsFromList internet } @@ -79,8 +77,6 @@ function installInternet () { # install Internet Apps (Menu) # function installInternetMenu () { - runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \ - "setting as do not add repo" installAppsFromListMenu internet } @@ -166,20 +162,14 @@ function installGamesMenu () { # Steam (headless) # function installSteam () { - runCmd "echo \"steam steam/purge note\" | sudo debconf-set-selections" \ - "accepting steam licence" - runCmd "echo \"steam steam/license note\" | sudo debconf-set-selections" \ - "accepting steam licence 2/3" - runCmd "echo \"steam steam/question select I AGREE\" | sudo debconf-set-selections" \ - "accepting steam licence 3/3" - installPackage apt steam + installAppsFromList steam } # # Steam (Menu) # function installSteamMenu () { - installPackage apt steam + installAppsFromListMenu steam } # @@ -200,8 +190,6 @@ function installBurningToolsMenu () { # install Network Apps (headless) # function installNetTools () { - runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \ - "setting Wireshark as root only" installAppsFromList nettools } @@ -209,8 +197,6 @@ function installNetTools () { # install Network Apps (Menu) # function installNetToolsMenu () { - runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \ - "setting Wireshark as root only" installAppsFromListMenu nettools } @@ -616,8 +602,6 @@ function installJavascriptMenu () { # install JAVA 10 (headless) # function installJava10 () { - runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ - "accepting Oracle Java SE 10 licence agreement" installAppsFromList java10 } @@ -625,8 +609,6 @@ function installJava10 () { # install JAVA 10 (Menu) # function installJava10Menu () { - runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ - "accepting Oracle Java SE 10 licence agreement" installAppsFromListMenu java10 } diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 04681d6..f6eb00b 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -76,8 +76,6 @@ function installEbookMenu () { # install Internet Apps (headless) # function installInternet () { - runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \ - "setting as do not add repo" installAppsFromList internet } @@ -85,8 +83,6 @@ function installInternet () { # install Internet Apps (Menu) # function installInternetMenu () { - runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \ - "setting as do not add repo" installAppsFromListMenu internet } @@ -190,20 +186,14 @@ function installGamesMenu () { # Steam (headless) # function installSteam () { - runCmd "echo \"steam steam/purge note\" | sudo debconf-set-selections" \ - "accepting steam licence" - runCmd "echo \"steam steam/license note\" | sudo debconf-set-selections" \ - "accepting steam licence 2/3" - runCmd "echo \"steam steam/question select I AGREE\" | sudo debconf-set-selections" \ - "accepting steam licence 3/3" - installPackage apt steam + installAppsFromList steam } # # Steam (Menu) # function installSteamMenu () { - installPackage apt steam + installAppsFromListMenu steam } # @@ -224,8 +214,6 @@ function installBurningToolsMenu () { # install Network Apps (headless) # function installNetTools () { - runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \ - "setting Wireshark as root only" installAppsFromList nettools } @@ -233,8 +221,6 @@ function installNetTools () { # install Network Apps (Menu) # function installNetToolsMenu () { - runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \ - "setting Wireshark as root only" installAppsFromListMenu nettools } @@ -585,8 +571,6 @@ function installJavascriptMenu () { # install JAVA 10 (headless) # function installJava10 () { - runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ - "accepting Oracle Java SE 10 licence agreement" installAppsFromList java10 } @@ -594,8 +578,6 @@ function installJava10 () { # install JAVA 10 (Menu) # function installJava10Menu () { - runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ - "accepting Oracle Java SE 10 licence agreement" installAppsFromListMenu java10 } diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index c244717..48ab919 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -200,6 +200,7 @@ weppy;pip;python;weppy py-term;pip;python;py-term jstest-gtk;apt;games;jstest-gtk dosbox;apt;games;dosbox +steam;apt;steam;steam brasero;apt;burningtools;brasero k3b;apt;burningtools;k3b k3b-extrathemes;apt;burningtools;k3b-extrathemes @@ -1175,6 +1176,56 @@ function addRepo_AndroidStudio () { addPPA ppa:maarten-fonville/android-studio } +#-----------------------------------------------------------------------------# +# Package pre install functions list # +#-----------------------------------------------------------------------------# + +# +# list of pre install functions +# fields : unique ID, function to process after install +# +AppsPreTrtFct="opera-stable;opera_PreTrtFct +steam;steam_PreTrtFct +wireshark;wireshark_PreTrtFct +oracle-java10-installer;java10_PreTrtFct +oracle-java10-set-default;java10_PreTrtFct" + +# +# JAVA 10 +# +function java10_PreTrtFct () { + runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ + "accepting Oracle Java SE 10 licence agreement" +} + +# +# Opera +# +function opera_PreTrtFct () { + runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \ + "setting as do not add repo" +} + +# +# Steam +# +function steam_PreTrtFct () { + runCmd "echo \"steam steam/purge note\" | sudo debconf-set-selections" \ + "accepting steam licence" + runCmd "echo \"steam steam/license note\" | sudo debconf-set-selections" \ + "accepting steam licence 2/3" + runCmd "echo \"steam steam/question select I AGREE\" | sudo debconf-set-selections" \ + "accepting steam licence 3/3" +} + +# +# Wireshark +# +function wireshark_PreTrtFct () { + runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \ + "setting Wireshark as root only" +} + #-----------------------------------------------------------------------------# # Package post install functions list # #-----------------------------------------------------------------------------# @@ -1183,17 +1234,18 @@ function addRepo_AndroidStudio () { # list of post install functions # fields : unique ID, function to process after install # -AppsTrtFct="nitrogen;nitrogen_TrtFct -mongodb;mongodb_TrtFct -qttools5-dev-tools;qt_TrtFct -plank;plank_TrtFct -androidstudio;android_TrtFct -nodejs8lts;nodejs8lts_TrtFct" +AppsPostTrtFct="nitrogen;nitrogen_PostTrtFct +mongodb;mongodb_PostTrtFct +qttools5-dev-tools;qt_PostTrtFct +plank;plank_PostTrtFct +androidstudio;android_PostTrtFct +nodejs8lts;nodejs8lts_PostTrtFct +mc;mc_PostTrtFct" # +# NodeJS 8 LTS # -# -function nodejs8lts_TrtFct () { +function nodejs8lts_PostTrtFct () { msg "Sanitizing NodeJS install" if which /usr/local/bin/node >/dev/null; then runCmd "sudo rm /usr/local/bin/node" \ @@ -1206,7 +1258,7 @@ function nodejs8lts_TrtFct () { # # Android Env for adb, fastboot, .... # -function android_TrtFct () { +function android_PostTrtFct () { msg "Adding Android devices UDEV rules" sudo sh -c "echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0502\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Acer\n\ @@ -1255,7 +1307,7 @@ SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir # # Plank themes #TODO: test it -function plank_TrtFct () { +function plank_PostTrtFct () { typeset ret_code if ! (( $(ps -ef | grep -v grep | grep plank | wc -l) > 0 )); then @@ -1283,7 +1335,7 @@ function plank_TrtFct () { # # QT5 Dev Tools # -function qt_TrtFct () { +function qt_PostTrtFct () { runCmd "sudo ln -s /usr/share/qtchooser/qt5-x86_64-linux-gnu.conf /usr/lib/x86_64-linux-gnu/qtchooser/default.conf" \ "set QT5 as default" @@ -1298,7 +1350,7 @@ function qt_TrtFct () { # # MongoDB 3 CE # -function mongodb_TrtFct () { +function mongodb_PostTrtFct () { runCmd "sudo systemctl enable mongod.service" \ "enabling mongod service at boot" runCmd "sudo systemctl start mongod.service" \ @@ -1308,7 +1360,7 @@ function mongodb_TrtFct () { # # nitrogen post install function # -function nitrogen_TrtFct () { +function nitrogen_PostTrtFct () { if isMate; then runCmd "gsettings set org.mate.background draw-background false" \ "disabling Caja background management" diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 6011578..d74c1f8 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -181,6 +181,7 @@ weppy;pip;python;weppy py-term;pip;python;py-term jstest-gtk;apt;games;jstest-gtk dosbox;apt;games;dosbox +steam;apt;steam;steam brasero;apt;burningtools;brasero k3b;apt;burningtools;k3b k3b-extrathemes;apt;burningtools;k3b-extrathemes @@ -983,6 +984,55 @@ function addRepo_AndroidStudio () { addPPA ppa:maarten-fonville/android-studio } +#-----------------------------------------------------------------------------# +# Package pre install functions list # +#-----------------------------------------------------------------------------# + +# +# list of pre install functions +# fields : unique ID, function to process after install +# +AppsPreTrtFct="opera-stable;opera_PreTrtFct +steam;steam_PreTrtFct +wireshark;wireshark_PreTrtFct +oracle-java10-installer;java10_PreTrtFct +oracle-java10-set-default;java10_PreTrtFct" + +# +# JAVA 10 +# +function java10_PreTrtFct () { + runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ + "accepting Oracle Java SE 10 licence agreement" +} +# +# Opera +# +function opera_PreTrtFct () { + runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \ + "setting as do not add repo" +} + +# +# Steam +# +function steam_PreTrtFct () { + runCmd "echo \"steam steam/purge note\" | sudo debconf-set-selections" \ + "accepting steam licence" + runCmd "echo \"steam steam/license note\" | sudo debconf-set-selections" \ + "accepting steam licence 2/3" + runCmd "echo \"steam steam/question select I AGREE\" | sudo debconf-set-selections" \ + "accepting steam licence 3/3" +} + +# +# Wireshark +# +function wireshark_PreTrtFct () { + runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \ + "setting Wireshark as root only" +} + #-----------------------------------------------------------------------------# # Package post install functions list # #-----------------------------------------------------------------------------# @@ -991,17 +1041,17 @@ function addRepo_AndroidStudio () { # list of post install functions # fields : unique ID, function to process after install # -AppsTrtFct="nitrogen;nitrogen_TrtFct -mongodb;mongodb_TrtFct -qttools5-dev-tools;qt_TrtFct -plank;plank_TrtFct -androidstudio;android_TrtFct -nodejs8lts;nodejs8lts_TrtFct" +AppsPostTrtFct="nitrogen;nitrogen_PostTrtFct +mongodb;mongodb_PostTrtFct +qttools5-dev-tools;qt_PostTrtFct +plank;plank_PostTrtFct +androidstudio;android_PostTrtFct +nodejs8lts;nodejs8lts_PostTrtFct" # +# NodeJS 8 LTS # -# -function nodejs8lts_TrtFct () { +function nodejs8lts_PostTrtFct () { msg "Sanitizing NodeJS install" if which /usr/local/bin/node >/dev/null; then runCmd "sudo rm /usr/local/bin/node" \ @@ -1014,7 +1064,7 @@ function nodejs8lts_TrtFct () { # # Android Env for adb, fastboot, .... # -function android_TrtFct () { +function android_PostTrtFct () { msg "Adding Android devices UDEV rules" sudo sh -c "echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0502\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Acer\n\ @@ -1063,7 +1113,7 @@ SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir # # Plank themes #TODO: test it -function plank_TrtFct () { +function plank_PostTrtFct () { typeset ret_code if ! (( $(ps -ef | grep -v grep | grep plank | wc -l) > 0 )); then @@ -1091,7 +1141,7 @@ function plank_TrtFct () { # # QT5 Dev Tools # -function qt_TrtFct () { +function qt_PostTrtFct () { runCmd "sudo ln -s /usr/share/qtchooser/qt5-x86_64-linux-gnu.conf /usr/lib/x86_64-linux-gnu/qtchooser/default.conf" \ "set QT5 as default" @@ -1106,7 +1156,7 @@ function qt_TrtFct () { # # MongoDB 3 CE # -function mongodb_TrtFct () { +function mongodb_PostTrtFct () { runCmd "sudo systemctl enable mongod.service" \ "enabling mongod service at boot" runCmd "sudo systemctl start mongod.service" \ @@ -1116,7 +1166,7 @@ function mongodb_TrtFct () { # # nitrogen post install function # -function nitrogen_TrtFct () { +function nitrogen_PostTrtFct () { if isMate; then runCmd "gsettings set org.mate.background draw-background false" \ "disabling Caja background management" From b0c3784a0b183ce5b29a815b1a92120b2c917b2e Mon Sep 17 00:00:00 2001 From: shakasan Date: Mon, 28 May 2018 15:06:47 +0200 Subject: [PATCH 037/261] gcolor2 added --- repo_functions_ub1604.sh | 1 + repo_functions_ub1804.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 48ab919..a5d4fa6 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -99,6 +99,7 @@ entangle;apt;multimedia;entangle krita;apt;multimedia;krita soundconverter;apt;multimedia;soundconverter gimp;apt;multimedia;gimp +gcolor2;apt;multimedia;gcolor2 vidcutter;apt;multimedia;vidcutter green-recorder;apt;multimedia;green-recorder radiotray;apt;multimedia;radiotray diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index d74c1f8..42d2b53 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -93,6 +93,7 @@ entangle;apt;multimedia;entangle krita;apt;multimedia;krita soundconverter;apt;multimedia;soundconverter gimp;apt;multimedia;gimp +gcolor2;apt;multimedia;gcolor2 vidcutter;apt;multimedia;vidcutter green-recorder;apt;multimedia;green-recorder radiotray;apt;multimedia;radiotray From 5afbd371d26fc7764ac8e940ffb1de55d53eb64f Mon Sep 17 00:00:00 2001 From: shakasan Date: Mon, 28 May 2018 15:47:01 +0200 Subject: [PATCH 038/261] purple-facebook repo bug fixed --- repo_functions_ub1804.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 42d2b53..0be8ff7 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -511,7 +511,7 @@ function addRepo_Webupd8 () { function addRepo_Jgeboski () { addKey "https://jgeboski.github.io/obs.key" addRepo jgeboski.list \ - "deb http://download.opensuse.org/repositories/home:/jgeboski/xUbuntu_16.04/ ./" + "deb http://download.opensuse.org/repositories/home:/jgeboski/xUbuntu_18.04/ ./" } # From f1bd6fbddfe4caf1eb9209b459f09de0d7841246 Mon Sep 17 00:00:00 2001 From: shakasan Date: Mon, 28 May 2018 15:49:20 +0200 Subject: [PATCH 039/261] some indent changes --- repo_functions_ub1604.sh | 12 ++++++------ repo_functions_ub1804.sh | 10 +++++----- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index a5d4fa6..d1ece12 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -779,7 +779,7 @@ function addRepo_Geary () { # Gimp / Gmic # function addRepo_Gimp () { -addPPA ppa:otto-kesselgulasch/gimp + addPPA ppa:otto-kesselgulasch/gimp } # @@ -800,21 +800,21 @@ function addRepo_IndicatorSoundSwitcher () { # Kodi / XBMC # function addRepo_Kodi () { -addPPA ppa:team-xbmc/ppa + addPPA ppa:team-xbmc/ppa } # # Deluge # function addRepo_Deluge () { -addPPA ppa:deluge-team/ppa + addPPA ppa:deluge-team/ppa } # # Corebird # function addRepo_Corebird () { -addPPA ppa:ubuntuhandbook1/corebird + addPPA ppa:ubuntuhandbook1/corebird } # @@ -828,7 +828,7 @@ function addRepo_Zeal () { # Sayonara # function addRepo_Sayonara () { -addPPA ppa:lucioc/sayonara + addPPA ppa:lucioc/sayonara } # @@ -849,7 +849,7 @@ function addRepo_Shotcut () { # Y-PPA-Manager # function addRepo_YPPAManager () { -addPPA ppa:webupd8team/y-ppa-manager + addPPA ppa:webupd8team/y-ppa-manager } # diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 0be8ff7..480c3a1 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -615,7 +615,7 @@ function addRepo_Geary () { # Gimp / Gmic # function addRepo_Gimp () { -addPPA ppa:otto-kesselgulasch/gimp + addPPA ppa:otto-kesselgulasch/gimp } # @@ -636,21 +636,21 @@ function addRepo_IndicatorSoundSwitcher () { # Kodi / XBMC # function addRepo_Kodi () { -addPPA ppa:team-xbmc/ppa + addPPA ppa:team-xbmc/ppa } # # Deluge # function addRepo_Deluge () { -addPPA ppa:deluge-team/ppa + addPPA ppa:deluge-team/ppa } # # Corebird # function addRepo_Corebird () { -addPPA ppa:ubuntuhandbook1/corebird + addPPA ppa:ubuntuhandbook1/corebird } # @@ -802,7 +802,7 @@ function addRepo_DarkTable () { # WireShark # function addRepo_WireShark () { -addPPA ppa:wireshark-dev/stable + addPPA ppa:wireshark-dev/stable } # From 806e5f0d0981af0b6fd57dd27404b4038164e5a8 Mon Sep 17 00:00:00 2001 From: shakasan Date: Tue, 29 May 2018 13:02:06 +0200 Subject: [PATCH 040/261] menu bug fixed --- menus_functions_ub1604.sh | 6 +----- menus_functions_ub1804.sh | 6 +----- vars.sh | 2 +- yggdrasil.sh | 4 ++-- 4 files changed, 5 insertions(+), 13 deletions(-) diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh index 6f5e010..3b0fe69 100644 --- a/menus_functions_ub1604.sh +++ b/menus_functions_ub1604.sh @@ -308,7 +308,6 @@ function showAppInstallMenu () { "internet" "Internet Apps" \ "utilities" "Misc Utilities" \ "games" "Games & tools" \ - "steam" "Steam" \ "burningtools" "Disc Burning and tools" \ "nettools" "Network tools" \ "cajaplugins" "Caja Plugins" \ @@ -340,9 +339,6 @@ function showAppInstallMenu () { "games") installGamesMenu ;; - "steam") - installSteamMenu - ;; "burningtools") installBurningToolsMenu ;; @@ -478,4 +474,4 @@ function showHardwareMenu () { esac done -} \ No newline at end of file +} diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 1bb5305..ecfc9c7 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -308,7 +308,6 @@ function showAppInstallMenu () { "internet" "Internet Apps" \ "utilities" "Misc Utilities" \ "games" "Games & tools" \ - "steam" "Steam" \ "burningtools" "Disc Burning and tools" \ "nettools" "Network tools" \ "cajaplugins" "Caja Plugins" \ @@ -340,9 +339,6 @@ function showAppInstallMenu () { "games") installGamesMenu ;; - "steam") - installSteamMenu - ;; "burningtools") installBurningToolsMenu ;; @@ -462,4 +458,4 @@ function showHardwareMenu () { esac done -} \ No newline at end of file +} diff --git a/vars.sh b/vars.sh index 1ff9b08..2d7a3e4 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.4.0" +version="0.5.0-b1" # # myHomedir is used in full paths to the homedir diff --git a/yggdrasil.sh b/yggdrasil.sh index 99c427e..748f0e2 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -29,7 +29,7 @@ case $OS in ;; *) printf "\n" - printf $BOLDROUGE"Distribution non supportée/testée"$NORMAL + printf $BOLDROUGE"Linux distro not supported"$NORMAL printf "\n\n" ;; esac @@ -340,4 +340,4 @@ esac # main menu done # end of main menu loop clear -exit \ No newline at end of file +exit From bc8a46fd5d8b62e237c4544b5c041fbe0303ac84 Mon Sep 17 00:00:00 2001 From: shakasan Date: Wed, 30 May 2018 09:09:12 +0200 Subject: [PATCH 041/261] . --- core_functions.sh | 7 +++---- repo_functions_ub1604.sh | 1 + repo_functions_ub1804.sh | 1 + yggdrasil.sh | 4 ++-- 4 files changed, 7 insertions(+), 6 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 82034d0..70a79d6 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -411,8 +411,7 @@ function addSpecificRepoFct () { for i in $AppsRepo; do appRepo=(${i//;/ }) if [ "${appRepo[0]}" == "$1" ]; then - printf "[ADD] package -- $1 -- repo/ppa " - printf "added by function -- ${appRepo[1]}\n" + printf "[ADD_REPP_PPA][$1][${appRepo[1]}]" eval "${appRepo[1]}" repoAdded=$(($repoAdded+1)) fi @@ -433,7 +432,7 @@ function processAppTrtFct () { for i in $AppsPostTrtFct; do appPostTrtFct=(${i//;/ }) if [ "${appPostTrtFct[0]}" == "$1" ]; then - printf "[TRT][POST][$1][${appPostTrtFct[1]}]\n" + printf "[TRT][POST][$1][${appPostTrtFct[1]}]" eval "${appPostTrtFct[1]}" fi done @@ -441,7 +440,7 @@ function processAppTrtFct () { for i in $AppsPreTrtFct; do appPreTrtFct=(${i//;/ }) if [ "${appPreTrtFct[0]}" == "$1" ]; then - printf "[TRT][PRE][$1][${appPreTrtFct[1]}]\n" + printf "[TRT][PRE][$1][${appPreTrtFct[1]}]" eval "${appPreTrtFct[1]}" fi done diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index d1ece12..7daf0aa 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -1324,6 +1324,7 @@ function plank_PostTrtFct () { && cd plank-themer-master/ \ && rm -fR ~/.config/plank/dock1/theme_index; \ rm -fR ~/.config/plank/dock1/themes-repo; \ + mkdir -p ~/.config/plank/dock1; \ cp -a theme_index/ ~/.config/plank/dock1 \ && cp -a themes-repo/ ~/.config/plank/dock1 \ && cd ~ \ diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 480c3a1..9b4d222 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1130,6 +1130,7 @@ function plank_PostTrtFct () { && cd plank-themer-master/ \ && rm -fR ~/.config/plank/dock1/theme_index; \ rm -fR ~/.config/plank/dock1/themes-repo; \ + mkdir -p ~/.config/plank/dock1; \ cp -a theme_index/ ~/.config/plank/dock1 \ && cp -a themes-repo/ ~/.config/plank/dock1 \ && cd ~ \ diff --git a/yggdrasil.sh b/yggdrasil.sh index 748f0e2..95a0442 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -17,12 +17,12 @@ source /opt/yggdrasil/tools_functions.sh OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` case $OS in - *"Ubuntu 18.04 LTS"* | *"Linux Mint 18"*) + *"Ubuntu 16.04"* | *"Linux Mint 18"*) source /opt/yggdrasil/repo_functions_ub1604.sh source /opt/yggdrasil/install_functions_ub1604.sh source /opt/yggdrasil/menus_functions_ub1604.sh ;; - *"Ubuntu 18.04 LTS"* | *"Linux Mint 19"*) + *"Ubuntu 18.04"* | *"Linux Mint 19"*) source /opt/yggdrasil/repo_functions_ub1804.sh source /opt/yggdrasil/install_functions_ub1804.sh source /opt/yggdrasil/menus_functions_ub1804.sh From d369bdbdca8ecac535ae3128aa06f999265d129f Mon Sep 17 00:00:00 2001 From: shakasan Date: Wed, 30 May 2018 13:15:57 +0200 Subject: [PATCH 042/261] cli args management improved + yggInit usage frequency optimized --- core_functions.sh | 1 + vars.sh | 6 ++ yggdrasil.sh | 138 ++++++++++++++++++++++++++++------------------ 3 files changed, 90 insertions(+), 55 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 70a79d6..871a541 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -574,6 +574,7 @@ function dispLogo () { printf " ╚═╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝╚═╝╚══════╝\n" printf "$BOLDROUGE Customize Linux Mint & Ubuntu derivatives made easier\n" printf "$BOLDBLANC ver "$version" - GPLv3 - Francois B. (Makotosan) - makotonoblog.be\n" + printf $NORMAL printf "\n" } diff --git a/vars.sh b/vars.sh index 2d7a3e4..959f233 100644 --- a/vars.sh +++ b/vars.sh @@ -36,6 +36,12 @@ cDate=$(date +%d-%m-%Y) # repoAdded=0 +# +# ygginit flag for CLI mode +# +ygginitCount=0 + + # # shell color codes # diff --git a/yggdrasil.sh b/yggdrasil.sh index 95a0442..19fa66b 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -54,16 +54,22 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >> # Headless Mode # #-----------------------------------------------------------------------------# +# display logo in CLI mode +[[ $# -gt 0 ]] && dispLogo + # # arguments/options management with getopts while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do case "$option" in a) # install all apps - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Installing Apps" installBase installOffice @@ -97,13 +103,15 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installTeamViewer13 installXnViewMP toolAutoremove - exit ;; f) # full install - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Installing Apps" installBase installOffice @@ -142,89 +150,106 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installTeamViewer13 installXnViewMP toolAutoremove - exit ;; c) # install themes and icons - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Installing Icons/Themes" installIcons installThemes - exit ;; w) # nitrogen - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Installing Nitrogen" installNitrogen - exit ;; d) # install Unbound DNS Cache - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Installing Unbound" installUnbound - exit ;; q) # cardreader - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Installing Card Readers Apps" installCardReader - exit ;; s) # solaar for logitech devices - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Installing Solaar" installSolaar - exit ;; t) # tlp (laptop or low energy usage) - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Installing TLP" installTLP - exit ;; n) # latest nvidia driver (see menus if need older version) - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Installing Nvidia Latest Driver" installNvidia396 - exit ;; g) # latest feee graphic drivers, mesa, ... - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Installing Free Graphic Drivers" installOibaf - exit ;; k) - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem + if [ "$ygginitCount" -eq "0" ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=$(($ygginitCount+1)) + fi msg "Updating Kernel" kernelUpdate - exit ;; u) msg "Initializing" @@ -258,6 +283,9 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do esac done +# if CLI mode, no need to run the menus... +[[ $# -gt 0 ]] && exit + #-----------------------------------------------------------------------------# # Menu Mode # #-----------------------------------------------------------------------------# From 336aea18ca20215d26425ee0eb76ddede726c66a Mon Sep 17 00:00:00 2001 From: shakasan Date: Wed, 30 May 2018 13:20:16 +0200 Subject: [PATCH 043/261] version updated to 0.5.0-b2 --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 959f233..7d707d2 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b1" +version="0.5.0-b2" # # myHomedir is used in full paths to the homedir From 8d48531f7a10f0e0bfcc12817d1e175f0da057a9 Mon Sep 17 00:00:00 2001 From: shakasan Date: Wed, 30 May 2018 13:21:44 +0200 Subject: [PATCH 044/261] comments changes --- core_functions.sh | 6 ------ tools_functions.sh | 6 ------ 2 files changed, 12 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 871a541..9361450 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -6,12 +6,6 @@ # website : https://makotonoblog.be/ # #-----------------------------------------------------------------------------# -#-----------------------------------------------------------------------------# -# # -# Ubuntu 16.04 / Linux Mint 18 # -# # -#-----------------------------------------------------------------------------# - #-----------------------------------------------------------------------------# # core functions # #-----------------------------------------------------------------------------# diff --git a/tools_functions.sh b/tools_functions.sh index 219fb5f..a399e7c 100644 --- a/tools_functions.sh +++ b/tools_functions.sh @@ -6,12 +6,6 @@ # website : https://makotonoblog.be/ # #-----------------------------------------------------------------------------# -#-----------------------------------------------------------------------------# -# # -# Ubuntu 16.04 / Linux Mint 18 # -# # -#-----------------------------------------------------------------------------# - #-----------------------------------------------------------------------------# # tools and config functions # #-----------------------------------------------------------------------------# From b7f90ef1eef875ce2114504263381d2d8116cff2 Mon Sep 17 00:00:00 2001 From: shakasan Date: Wed, 30 May 2018 13:38:34 +0200 Subject: [PATCH 045/261] no logo display in usage fct --- core_functions.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/core_functions.sh b/core_functions.sh index 9361450..f30cbd7 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -576,7 +576,6 @@ function dispLogo () { # show usage for headless mode # function usage () { - dispLogo dispSysInfos printf "\n" printf $NORMAL From bdb29a206215bc3c733639af723f15c2bcb1e696 Mon Sep 17 00:00:00 2001 From: Francois B Date: Wed, 30 May 2018 22:45:47 +0200 Subject: [PATCH 046/261] Eclipse is back by snap --- install_functions_ub1604.sh | 14 ++++++++++++++ install_functions_ub1804.sh | 14 ++++++++++++++ menus_functions_ub1604.sh | 4 ++++ menus_functions_ub1804.sh | 4 ++++ repo_functions_ub1604.sh | 3 ++- repo_functions_ub1804.sh | 3 ++- 6 files changed, 40 insertions(+), 2 deletions(-) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index e0d0dd1..1a3ef8e 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -789,6 +789,20 @@ function installIdeaMenu () { installAppsFromListMenu idea } +# +# install Eclipse Apps (headless) +# +function installEclipse () { + installAppsFromList eclipse +} + +# +# install Eclipse Apps (Menu) +# +function installEclipseMenu () { + installAppsFromListMenu eclipse +} + # # install Pycharm Apps (headless) # diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index f6eb00b..26b6a88 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -749,6 +749,20 @@ function installIdeaMenu () { installAppsFromListMenu idea } +# +# install Eclipse Apps (headless) +# +function installEclipse () { + installAppsFromList eclipse +} + +# +# install Eclipse Apps (Menu) +# +function installEclipseMenu () { + installAppsFromListMenu eclipse +} + # # install Pycharm Apps (headless) # diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh index 3b0fe69..12794b4 100644 --- a/menus_functions_ub1604.sh +++ b/menus_functions_ub1604.sh @@ -212,6 +212,7 @@ function showDevInstallMenu () { "codeblocks" "CodeBlocks" \ "geany" "Geany" \ "idea" "Idea" \ + "eclipse" "Eclipse" \ "pycharm" "PyCharm" \ "vsc" "Visual Studio Code" \ "androidstudio" "Android Studio" \ @@ -266,6 +267,9 @@ function showDevInstallMenu () { "idea") installIdeaMenu ;; + "eclipse") + installEclipseMenu + ;; "pycharm") installPyCharmMenu ;; diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index ecfc9c7..d3ebd7e 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -212,6 +212,7 @@ function showDevInstallMenu () { "codeblocks" "CodeBlocks" \ "geany" "Geany" \ "idea" "Idea" \ + "eclipse" "Eclipse" \ "pycharm" "PyCharm" \ "vsc" "Visual Studio Code" \ "androidstudio" "Android Studio" \ @@ -266,6 +267,9 @@ function showDevInstallMenu () { "idea") installIdeaMenu ;; + "eclipse") + installEclipseMenu + ;; "pycharm") installPyCharmMenu ;; diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 7daf0aa..591963c 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -430,7 +430,8 @@ 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" +intellij-idea-community;snap;idea;idea +eclipse;snap;eclipse;eclipse" #-----------------------------------------------------------------------------# # Specific Repo list and functions # diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 9b4d222..7072bb0 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -363,7 +363,8 @@ 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" +intellij-idea-community;snap;idea;idea +eclipse;snap;eclipse;eclipse" #-----------------------------------------------------------------------------# # Specific Repo list and functions # From eb5b111bb832a7441c23370c1f51a83df69f045c Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 3 Jun 2018 19:03:04 +0200 Subject: [PATCH 047/261] small bug in post trt fct list --- repo_functions_ub1604.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 591963c..08866e5 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -1241,8 +1241,7 @@ mongodb;mongodb_PostTrtFct qttools5-dev-tools;qt_PostTrtFct plank;plank_PostTrtFct androidstudio;android_PostTrtFct -nodejs8lts;nodejs8lts_PostTrtFct -mc;mc_PostTrtFct" +nodejs8lts;nodejs8lts_PostTrtFct" # # NodeJS 8 LTS From d9b770972948a469c83a825fe09c5bc69747f78c Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 3 Jun 2018 19:09:27 +0200 Subject: [PATCH 048/261] small change in output of addSpecificRepoFct --- core_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core_functions.sh b/core_functions.sh index f30cbd7..f67b564 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -405,7 +405,7 @@ function addSpecificRepoFct () { for i in $AppsRepo; do appRepo=(${i//;/ }) if [ "${appRepo[0]}" == "$1" ]; then - printf "[ADD_REPP_PPA][$1][${appRepo[1]}]" + printf "[ADD_REPP_PPA][$1][${appRepo[1]}]...\n" eval "${appRepo[1]}" repoAdded=$(($repoAdded+1)) fi From ec137966be4235b05c1b50f17d69b52a20733ba7 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sun, 3 Jun 2018 19:12:53 +0200 Subject: [PATCH 049/261] update microde fixed for 16.04 --- install_functions_ub1604.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index 1a3ef8e..36af055 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -377,15 +377,16 @@ function updateMicrocode () { intel=`cat /proc/cpuinfo | grep -i Intel | wc -l` amd=`cat /proc/cpuinfo | grep -i Amd | wc -l` if [ "$intel" -gt "0" ]; then - printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" installPackage apt intel-microcode + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` + printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" elif [ "$amd" -gt "0" ]; then installPackage apt amd64-microcode + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" else printf "[INFO] No Intel/AMD CPU found" fi - newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` printf "\n" } From 943a9bbe832dcdb3a637814f77cd1e5cd984e128 Mon Sep 17 00:00:00 2001 From: shakasan Date: Mon, 4 Jun 2018 11:09:16 +0200 Subject: [PATCH 050/261] } forgoten in the code ^^ --- repo_functions_ub1804.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 7072bb0..b6d4cb8 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -947,7 +947,7 @@ function addRepo_MongoDB3CE () { # addKey "https://dl.winehq.org/wine-builds/Release.key" # addRepo "winehq.list" \ # "deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main" -} +#} # # LibreOffice 6 From abebc5f64d885bb226559fcceb5be3c195bef386 Mon Sep 17 00:00:00 2001 From: shakasan Date: Mon, 4 Jun 2018 13:44:23 +0200 Subject: [PATCH 051/261] bunch of bugs fixed --- core_functions.sh | 26 ++++++++++++++++---------- repo_functions_ub1604.sh | 2 +- repo_functions_ub1804.sh | 5 +---- tools_functions.sh | 2 +- yggdrasil.sh | 2 -- 5 files changed, 19 insertions(+), 18 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index f67b564..c385550 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -175,6 +175,8 @@ function yggInit () { else printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n" printf "[INIT]" + installPackage apt "python3-distutils" + printf "[INIT]" installPackage pip "pip" printf "[INIT]" installPackage pip "setuptools" @@ -280,17 +282,21 @@ function addKey () { # function addRepo () { typeset ret_code - printf "[REPO] adding : $2 in $1 " - printf "\n[REPO] adding $2 in $1\n" &>> $logFile - echo $2 | sudo tee /etc/apt/sources.list.d/$1 &>> $logFile - 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 + if [ ! -f /etc/apt/sources.list.d/$1 ]; then + printf "[REPO] adding : $2 in $1 " + printf "\n[REPO] adding $2 in $1\n" &>> $logFile + echo $2 | sudo tee /etc/apt/sources.list.d/$1 &>> $logFile 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 } @@ -461,7 +467,7 @@ function installAppsFromList () { for i in $Apps; do app=(${i//;/ }) if [ "${app[2]}" == "$1" ]; then - processAppTrtFct ${app[3]} post + processAppTrtFct ${app[3]} pre installPackage ${app[1]} ${app[0]} processAppTrtFct ${app[3]} post fi diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 08866e5..97a2fda 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -133,7 +133,6 @@ corebird;apt;internet;corebird telegram;apt;internet;telegram skypeforlinux;apt;internet;skypeforlinux nextcloud-client;apt;internet;nextcloud-client -nextcloud-client-caja;apt;internet;nextcloud-client-caja deluge-gtk;apt;internet;deluge-gtk deluge-torrent;apt;internet;deluge-torrent vivaldi-stable;apt;internet;vivaldi-stable @@ -224,6 +223,7 @@ caja-wallpaper;apt;cajaplugins;caja-wallpaper caja-sendto;apt;cajaplugins;caka-sendto caja-image-converter;apt;cajaplugins;caja-image-converter insync-caja;apt;cajaplugins;insync-caja +nextcloud-client-caja;apt;cajaplugins;nextcloud-client-caja nautilus;apt;nautilus;nautilus file-roller;apt;nautilus;file-roller nautilus-terminal;apt;nautilus;nautilus-terminal diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index b6d4cb8..7c3854b 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -93,7 +93,6 @@ entangle;apt;multimedia;entangle krita;apt;multimedia;krita soundconverter;apt;multimedia;soundconverter gimp;apt;multimedia;gimp -gcolor2;apt;multimedia;gcolor2 vidcutter;apt;multimedia;vidcutter green-recorder;apt;multimedia;green-recorder radiotray;apt;multimedia;radiotray @@ -120,7 +119,6 @@ corebird;apt;internet;corebird telegram;apt;internet;telegram skypeforlinux;apt;internet;skypeforlinux nextcloud-client;apt;internet;nextcloud-client -nextcloud-client-caja;apt;internet;nextcloud-client-caja deluge-gtk;apt;internet;deluge-gtk deluge-torrent;apt;internet;deluge-torrent vivaldi-stable;apt;internet;vivaldi-stable @@ -204,6 +202,7 @@ caja-wallpaper;apt;cajaplugins;caja-wallpaper caja-sendto;apt;cajaplugins;caka-sendto caja-image-converter;apt;cajaplugins;caja-image-converter insync-caja;apt;cajaplugins;insync-caja +nextcloud-client-caja;apt;cajaplugins;nextcloud-client-caja nautilus;apt;nautilus;nautilus file-roller;apt;nautilus;file-roller nautilus-emblems;apt;nautilus;nautilus-emblems @@ -219,7 +218,6 @@ nautilus-ideviceinfo;apt;nautilus;nautilus-ideviceinfo ooo-thumbnailer;apt;nautilus;ooo-thumbnailer nautilus-dropbox;apt;nautilus;nautilus-dropbox nautilus-script-manager;apt;nautilus;nautilus-script-manager -nautilus-columns;apt;nautilus;nautilus-columns insync-nautilus;apt;nautilus;insync-nautilus gtkam-gimp;apt;gimp;gtkam-gimp gimp-gluas;apt;gimp;gimp-gluas @@ -262,7 +260,6 @@ purple-facebook;apt;pidgin;purple-facebook unbound;apt;unbound;unbound arc-theme;apt;gtkthemes;arc-theme numix-gtk-theme;apt;gtkthemes;numix-gtk-theme -arc-icons;apt;icons;arc-icons faenza-icon-theme;apt;icons;faenza-icon-theme numix-icon-theme;apt;icons;numix-icon-theme numix-icon-theme-circle;apt;icons;numix-icon-theme-circle diff --git a/tools_functions.sh b/tools_functions.sh index a399e7c..3c93c3a 100644 --- a/tools_functions.sh +++ b/tools_functions.sh @@ -65,7 +65,7 @@ function addScreenfetchBashrc () { # function enableHistoryTS () { 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 ret_code=$? retCode $ret_code diff --git a/yggdrasil.sh b/yggdrasil.sh index 19fa66b..6933a49 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -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 installTeamViewer13 installXnViewMP - toolAutoremove ;; f) # full install 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 installTeamViewer13 installXnViewMP - toolAutoremove ;; c) # install themes and icons if [ "$ygginitCount" -eq "0" ]; then From 5ee1d3ae8fd0126e28a10be723e8997306892753 Mon Sep 17 00:00:00 2001 From: shakasan Date: Mon, 4 Jun 2018 13:46:26 +0200 Subject: [PATCH 052/261] minor change --- core_functions.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index c385550..c138a15 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -467,9 +467,9 @@ function installAppsFromList () { for i in $Apps; do app=(${i//;/ }) if [ "${app[2]}" == "$1" ]; then - processAppTrtFct ${app[3]} pre + processAppTrtFct ${app[3]} "pre" installPackage ${app[1]} ${app[0]} - processAppTrtFct ${app[3]} post + processAppTrtFct ${app[3]} "post" fi done } @@ -512,9 +512,9 @@ function installAppsFromListMenu () { for i in $Apps; do app=(${i//;/ }) if [ "${app[3]}" == "${pkgToInstall//\"}" ]; then - processAppTrtFct ${app[3]} pre + processAppTrtFct ${app[3]} "pre" installPackage ${app[1]} ${app[0]} - processAppTrtFct ${app[3]} post + processAppTrtFct ${app[3]} "post" fi done done From 376301f05f892628a7de5868df6a1806bca012ea Mon Sep 17 00:00:00 2001 From: shakasan Date: Mon, 4 Jun 2018 13:53:20 +0200 Subject: [PATCH 053/261] . --- core_functions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core_functions.sh b/core_functions.sh index c138a15..8f1fd93 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -428,6 +428,7 @@ function addSpecificRepoFct () { # input : unique ID, pre/post # function processAppTrtFct () { + typeset i if [ "$2" == "post" ]; then for i in $AppsPostTrtFct; do appPostTrtFct=(${i//;/ }) @@ -445,6 +446,7 @@ function processAppTrtFct () { fi done fi + unset i } # From b0324bd859e682b58eed52118b29de83edd8c83a Mon Sep 17 00:00:00 2001 From: shakasan Date: Mon, 4 Jun 2018 14:14:53 +0200 Subject: [PATCH 054/261] . --- core_functions.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core_functions.sh b/core_functions.sh index 8f1fd93..0967745 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -169,6 +169,8 @@ function yggInit () { printf "[INIT]" installPackage apt "python3-pip" printf "[INIT]" + installPackage apt "python3-distutils" + printf "[INIT]" installPackage pip "pip" printf "[INIT]" installPackage pip "setuptools" From cb1faf48739971bdaae7d3a24b18675291979194 Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 19:24:26 +0200 Subject: [PATCH 055/261] . --- core_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core_functions.sh b/core_functions.sh index 0967745..eef0fea 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -413,7 +413,7 @@ function addSpecificRepoFct () { for i in $AppsRepo; do appRepo=(${i//;/ }) if [ "${appRepo[0]}" == "$1" ]; then - printf "[ADD_REPP_PPA][$1][${appRepo[1]}]...\n" + printf "[ADD_REPO_PPA][$1][${appRepo[1]}]...\n" eval "${appRepo[1]}" repoAdded=$(($repoAdded+1)) fi From 214125439706d4a1bf125dc22cc7c7b619776a4f Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 20:36:13 +0200 Subject: [PATCH 056/261] small bug in fct name for xnview --- install_functions_ub1804.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 26b6a88..deff615 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -134,7 +134,7 @@ function installXnViewMP () { # # XnViewMP (Menu) # -function installXnViewMP () { +function installXnViewMPMenu () { installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ xnviewmp.deb \ yes From b3f83360a49f4c264d0d4427896f5880f32f29bd Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 20:38:36 +0200 Subject: [PATCH 057/261] libacr38u removed --- repo_functions_ub1804.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 7c3854b..9379627 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -266,7 +266,6 @@ numix-icon-theme-circle;apt;icons;numix-icon-theme-circle solaar;apt;solaar;solaar pcscd;apt;cardreader;pcscd pcsc-tools;apt;cardreader;pcsc-tools -libacr38u;apt;cardreader;libacr38u guvcview;apt;webcam;guvcview cheese;apt;webcam;cheese nvidia-384;apt;nvidia-384;nvidia-384 From a6612ea59060fba429c8b882994995092f73b6af Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 20:42:05 +0200 Subject: [PATCH 058/261] agave removed --- repo_functions_ub1804.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 9379627..f62eded 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -286,7 +286,6 @@ nvidia-settings;apt;nvidia-driver-396;nvidia-settings nvidia-utils-396;apt;nvidia-driver-396;nvidia-utils-396 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq -agave;apt;dev;agave gpick;apt;dev;gpick virtualbox-5.2;apt;dev;virtualbox-5.2 build-essential;apt;dev;build-essential From 39e198e10cc74f763a4662947bd953d8b4cb21d6 Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 20:50:53 +0200 Subject: [PATCH 059/261] ygginit python3-distutils for LM19 only + zeal PPA removed --- core_functions.sh | 28 ++++++++++++++++++++++------ repo_functions_ub1804.sh | 8 -------- 2 files changed, 22 insertions(+), 14 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index eef0fea..9764193 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -79,9 +79,9 @@ function pressKey () { } # -# check if OS is Mint +# check if OS is Mint 18 # -function isMint () { +function isMint18 () { OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` if [[ $OS == *"Linux Mint 18"* ]]; then return 0 @@ -90,6 +90,18 @@ function isMint () { fi } +# +# check if OS is Mint 19 +# +function isMint18 () { + OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` + if [[ $OS == *"Linux Mint 19"* ]]; then + return 0 + else + return 1 + fi +} + # # check if DE is Mate # @@ -168,16 +180,20 @@ function yggInit () { printf "\n[INIT][PIP] not found, installing...\n" &>> $logFile printf "[INIT]" installPackage apt "python3-pip" - printf "[INIT]" - installPackage apt "python3-distutils" + if isMint19; then + printf "[INIT]" + installPackage apt "python3-distutils" + fi printf "[INIT]" installPackage pip "pip" printf "[INIT]" installPackage pip "setuptools" else printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - printf "[INIT]" - installPackage apt "python3-distutils" + if isMint19; then + printf "[INIT]" + installPackage apt "python3-distutils" + fi printf "[INIT]" installPackage pip "pip" printf "[INIT]" diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index f62eded..9fc4943 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -411,7 +411,6 @@ flacon;addRepo_Flacon y-ppa-manager;addRepo_YPPAManager diodon;addRepo_Diodon sayonara;addRepo_Sayonara -zeal;addRepo_Zeal corebird;addRepo_Corebird deluge-torrent;addRepo_Deluge deluge-gtk;addRepo_Deluge @@ -649,13 +648,6 @@ function addRepo_Corebird () { addPPA ppa:ubuntuhandbook1/corebird } -# -# Zeal -# -function addRepo_Zeal () { - addPPA ppa:zeal-developers/ppa -} - # # Sayonara # From 4d1693fa77bb12478b2d466a7930b93f7f65a0df Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 20:57:43 +0200 Subject: [PATCH 060/261] small disp bug + mongodb repo fixed --- core_functions.sh | 2 +- repo_functions_ub1804.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 9764193..dbe9a48 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -314,7 +314,7 @@ function addRepo () { retCode $ret_code fi else - printf "[REPO] already added [ "$BOLDVERT"OK"$NORMAL" ] " + printf "[REPO] already added [ "$BOLDVERT"OK"$NORMAL" ] \n" fi } diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 9fc4943..823ef42 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -924,7 +924,7 @@ function addRepo_Gyazo () { function addRepo_MongoDB3CE () { addKey "https://www.mongodb.org/static/pgp/server-3.6.asc" addRepo "mongodb-org-3.6.list" \ - "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/3.6 multiverse" + "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" } # From 471870a65dd1b91610f0660d9759d00cee49f3ed Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 20:59:50 +0200 Subject: [PATCH 061/261] php-cli updated from 7.0 to 7.2 --- repo_functions_ub1804.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 823ef42..6e3c869 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -312,7 +312,7 @@ emma-cli;npm;javascript;emma-cli jshint;npm;javascript;jshint oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default -php7.0-cli;apt;php;php7.0-cli +php7.2-cli;apt;php;php7.2-cli php-pear;apt;php;php-pear composer;apt;php;composer luajit;apt;lua;luajit From 2f9c6be4446aae77104823ec48fcd0d961926c25 Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 21:05:55 +0200 Subject: [PATCH 062/261] python3 install fixed --- repo_functions_ub1604.sh | 3 --- repo_functions_ub1804.sh | 3 --- 2 files changed, 6 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 97a2fda..1ad1a41 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -189,11 +189,8 @@ gyazo;apt;utilities;gyazo fdupes;apt;utilities;fdupes vulkan-utils;apt;utilities;vulkan-utils python3-dev;apt;python;python3-dev -python3-pip;apt;python;python3-pip python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools -pip;pip;python;setuptools -setuptools;pip;python;setuptools PyOpenGL;pip;python;PyOpenGL tweepy;pip;python;tweepy weppy;pip;python;weppy diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 6e3c869..5936b52 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -169,11 +169,8 @@ gyazo;apt;utilities;gyazo fdupes;apt;utilities;fdupes vulkan-utils;apt;utilities;vulkan-utils python3-dev;apt;python;python3-dev -python3-pip;apt;python;python3-pip python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools -pip;pip;python;setuptools -setuptools;pip;python;setuptools PyOpenGL;pip;python;PyOpenGL tweepy;pip;python;tweepy weppy;pip;python;weppy From 2e45a8a597410aa2af4358226d90b4b7d8cfd048 Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 21:07:20 +0200 Subject: [PATCH 063/261] cosmetic change --- core_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core_functions.sh b/core_functions.sh index dbe9a48..d48a026 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -429,7 +429,7 @@ function addSpecificRepoFct () { for i in $AppsRepo; do appRepo=(${i//;/ }) if [ "${appRepo[0]}" == "$1" ]; then - printf "[ADD_REPO_PPA][$1][${appRepo[1]}]...\n" + printf "[ADD_REPO_PPA][$1][${appRepo[1]}]..." eval "${appRepo[1]}" repoAdded=$(($repoAdded+1)) fi From cad5f67b2c5a343fdfe1712c14112065d0502413 Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 21:15:27 +0200 Subject: [PATCH 064/261] geany md plugin removed --- repo_functions_ub1804.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 5936b52..319a0d2 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -321,7 +321,6 @@ codeblocks;apt;codeblocks;codeblocks codeblocks-contrib;apt;codeblocks;codeblocks-contrib geany;apt;geany;geany geany-plugins;apt;geany;geany-plugins -geany-plugin-markdown;apt;geany;geany-plugin-markdown pycharm-community;snap;pycharm;pycharm sublime-text;apt;sublime-text;sublime-text kicad;apt;cad;kicad From 11c41b909c75dfcb8c15086414476274f3096b2a Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 21:18:08 +0200 Subject: [PATCH 065/261] cosmetic change --- core_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core_functions.sh b/core_functions.sh index d48a026..dbe9a48 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -429,7 +429,7 @@ function addSpecificRepoFct () { for i in $AppsRepo; do appRepo=(${i//;/ }) if [ "${appRepo[0]}" == "$1" ]; then - printf "[ADD_REPO_PPA][$1][${appRepo[1]}]..." + printf "[ADD_REPO_PPA][$1][${appRepo[1]}]...\n" eval "${appRepo[1]}" repoAdded=$(($repoAdded+1)) fi From fdb4b647ef59a8ad9d2eb34f990f60c3065d4def Mon Sep 17 00:00:00 2001 From: Francois B Date: Mon, 4 Jun 2018 21:24:19 +0200 Subject: [PATCH 066/261] ver updated --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 7d707d2..fc71790 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b2" +version="0.5.0-b3" # # myHomedir is used in full paths to the homedir From 91e11fb40f9edf76b3816a18e3d56319af4ffb86 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 08:52:09 +0200 Subject: [PATCH 067/261] bunch of changes --- core_functions.sh | 2 +- repo_functions_ub1604.sh | 8 +++++++- repo_functions_ub1804.sh | 23 ++++++++++++++++++++--- 3 files changed, 28 insertions(+), 5 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index dbe9a48..db0647b 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -93,7 +93,7 @@ function isMint18 () { # # check if OS is Mint 19 # -function isMint18 () { +function isMint19 () { OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` if [[ $OS == *"Linux Mint 19"* ]]; then return 0 diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 1ad1a41..49819cf 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -189,8 +189,11 @@ gyazo;apt;utilities;gyazo fdupes;apt;utilities;fdupes vulkan-utils;apt;utilities;vulkan-utils python3-dev;apt;python;python3-dev +python3-pip;apt;python;python3-pip python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools +pip;pip;python;setuptools +setuptools;pip;python;setuptools PyOpenGL;pip;python;PyOpenGL tweepy;pip;python;tweepy weppy;pip;python;weppy @@ -1257,7 +1260,7 @@ function nodejs8lts_PostTrtFct () { # Android Env for adb, fastboot, .... # function android_PostTrtFct () { - msg "Adding Android devices UDEV rules" + printf "[CMD] Adding Android devices UDEV rules " sudo sh -c "echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0502\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Acer\n\ SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0b05\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Asus\n\ @@ -1298,6 +1301,9 @@ SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2340\", MODE=\"0666\", OWNER=\""$myHomedir SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0930\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Toshiba\n\ SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir"\" # ZTE' > /etc/udev/rules.d/99-android.rules" + ret_code=$? + retCode $ret_code + runCmd "sudo service udev restart" \ "restarting UDEV service" } diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 319a0d2..afd6e55 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -169,8 +169,11 @@ gyazo;apt;utilities;gyazo fdupes;apt;utilities;fdupes vulkan-utils;apt;utilities;vulkan-utils python3-dev;apt;python;python3-dev +python3-pip;apt;python;python3-pip python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools +pip;pip;python;setuptools +setuptools;pip;python;setuptools PyOpenGL;pip;python;PyOpenGL tweepy;pip;python;tweepy weppy;pip;python;weppy @@ -263,6 +266,7 @@ numix-icon-theme-circle;apt;icons;numix-icon-theme-circle solaar;apt;solaar;solaar pcscd;apt;cardreader;pcscd pcsc-tools;apt;cardreader;pcsc-tools +libacr38u;apt;cardreader;libacr38u guvcview;apt;webcam;guvcview cheese;apt;webcam;cheese nvidia-384;apt;nvidia-384;nvidia-384 @@ -283,6 +287,7 @@ nvidia-settings;apt;nvidia-driver-396;nvidia-settings nvidia-utils-396;apt;nvidia-driver-396;nvidia-utils-396 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq +agave;apt;dev;agave gpick;apt;dev;gpick virtualbox-5.2;apt;dev;virtualbox-5.2 build-essential;apt;dev;build-essential @@ -309,7 +314,7 @@ emma-cli;npm;javascript;emma-cli jshint;npm;javascript;jshint oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default -php7.2-cli;apt;php;php7.2-cli +php7.0-cli;apt;php;php7.0-cli php-pear;apt;php;php-pear composer;apt;php;composer luajit;apt;lua;luajit @@ -321,6 +326,7 @@ codeblocks;apt;codeblocks;codeblocks codeblocks-contrib;apt;codeblocks;codeblocks-contrib geany;apt;geany;geany geany-plugins;apt;geany;geany-plugins +geany-plugin-markdown;apt;geany;geany-plugin-markdown pycharm-community;snap;pycharm;pycharm sublime-text;apt;sublime-text;sublime-text kicad;apt;cad;kicad @@ -407,6 +413,7 @@ flacon;addRepo_Flacon y-ppa-manager;addRepo_YPPAManager diodon;addRepo_Diodon sayonara;addRepo_Sayonara +zeal;addRepo_Zeal corebird;addRepo_Corebird deluge-torrent;addRepo_Deluge deluge-gtk;addRepo_Deluge @@ -644,6 +651,13 @@ function addRepo_Corebird () { addPPA ppa:ubuntuhandbook1/corebird } +# +# Zeal +# +function addRepo_Zeal () { + addPPA ppa:zeal-developers/ppa +} + # # Sayonara # @@ -920,7 +934,7 @@ function addRepo_Gyazo () { function addRepo_MongoDB3CE () { addKey "https://www.mongodb.org/static/pgp/server-3.6.asc" addRepo "mongodb-org-3.6.list" \ - "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" + "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/3.6 multiverse" } # @@ -1050,7 +1064,7 @@ function nodejs8lts_PostTrtFct () { # Android Env for adb, fastboot, .... # function android_PostTrtFct () { - msg "Adding Android devices UDEV rules" + printf "[CMD] Adding Android devices UDEV rules " sudo sh -c "echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0502\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Acer\n\ SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0b05\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Asus\n\ @@ -1091,6 +1105,9 @@ SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2340\", MODE=\"0666\", OWNER=\""$myHomedir SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0930\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Toshiba\n\ SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir"\" # ZTE' > /etc/udev/rules.d/99-android.rules" + ret_code=$? + retCode $ret_code + runCmd "sudo service udev restart" \ "restarting UDEV service" } From 85c0ef6c139c577f1f9ef665363b28d13f8511a9 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 09:00:21 +0200 Subject: [PATCH 068/261] android udev updated --- repo_functions_ub1604.sh | 78 ++++++++++++++++++++-------------------- repo_functions_ub1804.sh | 78 ++++++++++++++++++++-------------------- 2 files changed, 80 insertions(+), 76 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 49819cf..ac09ddd 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -1262,44 +1262,46 @@ function nodejs8lts_PostTrtFct () { function android_PostTrtFct () { printf "[CMD] Adding Android devices UDEV rules " - sudo sh -c "echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0502\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Acer\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0b05\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Asus\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"413c\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Dell\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0489\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Foxconn\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04c5\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Fujitsu\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04c5\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Fujitsu-Toshiba\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"091e\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Garmin-Asus\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"18d1\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Google-Nexus\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"201E\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Haier\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"109b\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Hisense\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0bb4\", MODE=\"0666\", OWNER=\""$myHomedir"\" # HTC\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"12d1\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Huawei\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"8087\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Intel\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"24e3\", MODE=\"0666\", OWNER=\""$myHomedir"\" # K-Touch\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2116\", MODE=\"0666\", OWNER=\""$myHomedir"\" # KT Tech\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0482\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Kyocera\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"17ef\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Lenovo\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1004\", MODE=\"0666\", OWNER=\""$myHomedir"\" # LG\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"22b8\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Motorola\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0e8d\", MODE=\"0666\", OWNER=\""$myHomedir"\" # MTK\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0409\", MODE=\"0666\", OWNER=\""$myHomedir"\" # NEC\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2080\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Nook\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0955\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Nvidia\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2257\", MODE=\"0666\", OWNER=\""$myHomedir"\" # OTGV\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"10a9\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Pantech\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1d4d\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Pegatron\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0471\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Philips\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04da\", MODE=\"0666\", OWNER=\""$myHomedir"\" # PMC-Sierra\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"05c6\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Qualcomm\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1f53\", MODE=\"0666\", OWNER=\""$myHomedir"\" # SK Telesys\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04e8\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Samsung\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04dd\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sharp\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"054c\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0fce\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony Ericsson\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0fce\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony Mobile Communications\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2340\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Teleepoch\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0930\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Toshiba\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir"\" # ZTE' > /etc/udev/rules.d/99-android.rules" +cat << EOF | sudo tee /etc/udev/rules.d/99-android.rules +SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", OWNER="$myHomedir" # Acer +SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", OWNER="$myHomedir" # Asus +SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", OWNER="$myHomedir" # Dell +SUBSYSTEM=="usb", ATTR{idVendor}=="0489", MODE="0666", OWNER="$myHomedir" # Foxconn +SUBSYSTEM=="usb", ATTR{idVendor}=="04c5", MODE="0666", OWNER="$myHomedir" # Fujitsu +SUBSYSTEM=="usb", ATTR{idVendor}=="04c5", MODE="0666", OWNER="$myHomedir" # Fujitsu-Toshiba +SUBSYSTEM=="usb", ATTR{idVendor}=="091e", MODE="0666", OWNER="$myHomedir" # Garmin-Asus +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", OWNER="$myHomedir" # Google-Nexus +SUBSYSTEM=="usb", ATTR{idVendor}=="201E", MODE="0666", OWNER="$myHomedir" # Haier +SUBSYSTEM=="usb", ATTR{idVendor}=="109b", MODE="0666", OWNER="$myHomedir" # Hisense +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", OWNER="$myHomedir" # HTC +SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", MODE="0666", OWNER="$myHomedir" # Huawei +SUBSYSTEM=="usb", ATTR{idVendor}=="8087", MODE="0666", OWNER="$myHomedir" # Intel +SUBSYSTEM=="usb", ATTR{idVendor}=="24e3", MODE="0666", OWNER="$myHomedir" # K-Touch +SUBSYSTEM=="usb", ATTR{idVendor}=="2116", MODE="0666", OWNER="$myHomedir" # KT Tech +SUBSYSTEM=="usb", ATTR{idVendor}=="0482", MODE="0666", OWNER="$myHomedir" # Kyocera +SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0666", OWNER="$myHomedir" # Lenovo +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", OWNER="$myHomedir" # LG +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", OWNER="$myHomedir" # Motorola +SUBSYSTEM=="usb", ATTR{idVendor}=="0e8d", MODE="0666", OWNER="$myHomedir" # MTK +SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", OWNER="$myHomedir" # NEC +SUBSYSTEM=="usb", ATTR{idVendor}=="2080", MODE="0666", OWNER="$myHomedir" # Nook +SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0666", OWNER="$myHomedir" # Nvidia +SUBSYSTEM=="usb", ATTR{idVendor}=="2257", MODE="0666", OWNER="$myHomedir" # OTGV +SUBSYSTEM=="usb", ATTR{idVendor}=="10a9", MODE="0666", OWNER="$myHomedir" # Pantech +SUBSYSTEM=="usb", ATTR{idVendor}=="1d4d", MODE="0666", OWNER="$myHomedir" # Pegatron +SUBSYSTEM=="usb", ATTR{idVendor}=="0471", MODE="0666", OWNER="$myHomedir" # Philips +SUBSYSTEM=="usb", ATTR{idVendor}=="04da", MODE="0666", OWNER="$myHomedir" # PMC-Sierra +SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", MODE="0666", OWNER="$myHomedir" # Qualcomm +SUBSYSTEM=="usb", ATTR{idVendor}=="1f53", MODE="0666", OWNER="$myHomedir" # SK Telesys +SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", OWNER="$myHomedir" # Samsung +SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", OWNER="$myHomedir" # Sharp +SUBSYSTEM=="usb", ATTR{idVendor}=="054c", MODE="0666", OWNER="$myHomedir" # Sony +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", OWNER="$myHomedir" # Sony Ericsson +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", OWNER="$myHomedir" # Sony Mobile Communications +SUBSYSTEM=="usb", ATTR{idVendor}=="2340", MODE="0666", OWNER="$myHomedir" # Teleepoch +SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", OWNER="$myHomedir" # Toshiba +SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", OWNER="$myHomedir" # ZTE +EOF ret_code=$? retCode $ret_code diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index afd6e55..cf2fb20 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1066,44 +1066,46 @@ function nodejs8lts_PostTrtFct () { function android_PostTrtFct () { printf "[CMD] Adding Android devices UDEV rules " - sudo sh -c "echo 'SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0502\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Acer\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0b05\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Asus\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"413c\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Dell\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0489\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Foxconn\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04c5\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Fujitsu\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04c5\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Fujitsu-Toshiba\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"091e\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Garmin-Asus\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"18d1\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Google-Nexus\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"201E\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Haier\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"109b\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Hisense\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0bb4\", MODE=\"0666\", OWNER=\""$myHomedir"\" # HTC\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"12d1\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Huawei\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"8087\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Intel\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"24e3\", MODE=\"0666\", OWNER=\""$myHomedir"\" # K-Touch\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2116\", MODE=\"0666\", OWNER=\""$myHomedir"\" # KT Tech\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0482\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Kyocera\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"17ef\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Lenovo\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1004\", MODE=\"0666\", OWNER=\""$myHomedir"\" # LG\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"22b8\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Motorola\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0e8d\", MODE=\"0666\", OWNER=\""$myHomedir"\" # MTK\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0409\", MODE=\"0666\", OWNER=\""$myHomedir"\" # NEC\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2080\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Nook\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0955\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Nvidia\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2257\", MODE=\"0666\", OWNER=\""$myHomedir"\" # OTGV\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"10a9\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Pantech\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1d4d\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Pegatron\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0471\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Philips\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04da\", MODE=\"0666\", OWNER=\""$myHomedir"\" # PMC-Sierra\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"05c6\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Qualcomm\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"1f53\", MODE=\"0666\", OWNER=\""$myHomedir"\" # SK Telesys\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04e8\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Samsung\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"04dd\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sharp\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"054c\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0fce\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony Ericsson\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0fce\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Sony Mobile Communications\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"2340\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Teleepoch\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"0930\", MODE=\"0666\", OWNER=\""$myHomedir"\" # Toshiba\n\ -SUBSYSTEM==\"usb\", ATTR{idVendor}==\"19d2\", MODE=\"0666\", OWNER=\""$myHomedir"\" # ZTE' > /etc/udev/rules.d/99-android.rules" +cat << EOF | sudo tee /etc/udev/rules.d/99-android.rules +SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", OWNER="$myHomedir" # Acer +SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", OWNER="$myHomedir" # Asus +SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", OWNER="$myHomedir" # Dell +SUBSYSTEM=="usb", ATTR{idVendor}=="0489", MODE="0666", OWNER="$myHomedir" # Foxconn +SUBSYSTEM=="usb", ATTR{idVendor}=="04c5", MODE="0666", OWNER="$myHomedir" # Fujitsu +SUBSYSTEM=="usb", ATTR{idVendor}=="04c5", MODE="0666", OWNER="$myHomedir" # Fujitsu-Toshiba +SUBSYSTEM=="usb", ATTR{idVendor}=="091e", MODE="0666", OWNER="$myHomedir" # Garmin-Asus +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", OWNER="$myHomedir" # Google-Nexus +SUBSYSTEM=="usb", ATTR{idVendor}=="201E", MODE="0666", OWNER="$myHomedir" # Haier +SUBSYSTEM=="usb", ATTR{idVendor}=="109b", MODE="0666", OWNER="$myHomedir" # Hisense +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", OWNER="$myHomedir" # HTC +SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", MODE="0666", OWNER="$myHomedir" # Huawei +SUBSYSTEM=="usb", ATTR{idVendor}=="8087", MODE="0666", OWNER="$myHomedir" # Intel +SUBSYSTEM=="usb", ATTR{idVendor}=="24e3", MODE="0666", OWNER="$myHomedir" # K-Touch +SUBSYSTEM=="usb", ATTR{idVendor}=="2116", MODE="0666", OWNER="$myHomedir" # KT Tech +SUBSYSTEM=="usb", ATTR{idVendor}=="0482", MODE="0666", OWNER="$myHomedir" # Kyocera +SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0666", OWNER="$myHomedir" # Lenovo +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", OWNER="$myHomedir" # LG +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", OWNER="$myHomedir" # Motorola +SUBSYSTEM=="usb", ATTR{idVendor}=="0e8d", MODE="0666", OWNER="$myHomedir" # MTK +SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", OWNER="$myHomedir" # NEC +SUBSYSTEM=="usb", ATTR{idVendor}=="2080", MODE="0666", OWNER="$myHomedir" # Nook +SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0666", OWNER="$myHomedir" # Nvidia +SUBSYSTEM=="usb", ATTR{idVendor}=="2257", MODE="0666", OWNER="$myHomedir" # OTGV +SUBSYSTEM=="usb", ATTR{idVendor}=="10a9", MODE="0666", OWNER="$myHomedir" # Pantech +SUBSYSTEM=="usb", ATTR{idVendor}=="1d4d", MODE="0666", OWNER="$myHomedir" # Pegatron +SUBSYSTEM=="usb", ATTR{idVendor}=="0471", MODE="0666", OWNER="$myHomedir" # Philips +SUBSYSTEM=="usb", ATTR{idVendor}=="04da", MODE="0666", OWNER="$myHomedir" # PMC-Sierra +SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", MODE="0666", OWNER="$myHomedir" # Qualcomm +SUBSYSTEM=="usb", ATTR{idVendor}=="1f53", MODE="0666", OWNER="$myHomedir" # SK Telesys +SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", OWNER="$myHomedir" # Samsung +SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", OWNER="$myHomedir" # Sharp +SUBSYSTEM=="usb", ATTR{idVendor}=="054c", MODE="0666", OWNER="$myHomedir" # Sony +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", OWNER="$myHomedir" # Sony Ericsson +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", OWNER="$myHomedir" # Sony Mobile Communications +SUBSYSTEM=="usb", ATTR{idVendor}=="2340", MODE="0666", OWNER="$myHomedir" # Teleepoch +SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", OWNER="$myHomedir" # Toshiba +SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", OWNER="$myHomedir" # ZTE +EOF ret_code=$? retCode $ret_code From cec17db99cfebd5a7e9789ad680b51e0f547ad72 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 09:13:53 +0200 Subject: [PATCH 069/261] add nitrogen support to cinnamon/nemo (TBT!) --- core_functions.sh | 11 +++++++++++ repo_functions_ub1604.sh | 15 ++++++++++++++- repo_functions_ub1804.sh | 15 ++++++++++++++- 3 files changed, 39 insertions(+), 2 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index db0647b..f5abb2a 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -113,6 +113,17 @@ function isMate () { fi } +# +# heck if DE is Cinnamon +# +function isCinnamon () { + if [[ $DESKTOP_SESSION == *"cinnamon"* ]]; then + return 0 + else + return 1 + fi +} + # # check and install required dependencies for Yggdrasil # diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index ac09ddd..20e8011 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -1374,6 +1374,19 @@ function nitrogen_PostTrtFct () { runCmd "gsettings set org.mate.background show-desktop-icons false" \ "disabling Caja desktop icons management" + createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ + "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ + "Utility;GTK" \ + "Nitrogen" \ + "local" \ + "start" + update-menus + elif isCinnamon; then + runCmd "gsettings set org.nemo.desktop draw-background false" \ + "disabling Caja background management" + runCmd "gsettings set org.nemo.desktop show-desktop-icons false" \ + "disabling Caja desktop icons management" + createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ "Utility;GTK" \ @@ -1382,6 +1395,6 @@ function nitrogen_PostTrtFct () { "start" update-menus else - printf "[ERR] only Mate Desktop is currently supported\n" + printf "[ERR] only Mate/Cinnamon Desktop is currently supported\n" fi } diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index cf2fb20..7dddaf0 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1178,6 +1178,19 @@ function nitrogen_PostTrtFct () { runCmd "gsettings set org.mate.background show-desktop-icons false" \ "disabling Caja desktop icons management" + createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ + "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ + "Utility;GTK" \ + "Nitrogen" \ + "local" \ + "start" + update-menus + elif isCinnamon; then + runCmd "gsettings set org.nemo.desktop draw-background false" \ + "disabling Caja background management" + runCmd "gsettings set org.nemo.desktop show-desktop-icons false" \ + "disabling Caja desktop icons management" + createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ "Utility;GTK" \ @@ -1186,6 +1199,6 @@ function nitrogen_PostTrtFct () { "start" update-menus else - printf "[ERR] only Mate Desktop is currently supported\n" + printf "[ERR] only Mate/Cinnamon Desktop is currently supported\n" fi } From b48faf2c02c32da9e5e18e131788fe68704830c6 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 09:22:46 +0200 Subject: [PATCH 070/261] add some comments --- core_functions.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/core_functions.sh b/core_functions.sh index f5abb2a..127ccc6 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -154,6 +154,7 @@ function yggInit () { printf "[INIT]" installPackage apt "apt-transport-https" + # UMAKE if ! which umake >/dev/null; then printf "[INIT][UMAKE] not found, installing...\n" printf "\n[INIT][UMAKE] not found, installing...\n" &>> $logFile @@ -162,6 +163,7 @@ function yggInit () { printf "[INIT][UMAKE] found [ "$BOLDVERT"OK"$NORMAL" ] \n" fi + # GEM if ! which gem >/dev/null; then printf "[INIT][GEM] not found, installing...\n" printf "\n[INIT][GEM] not found, installing...\n" &>> $logFile @@ -170,6 +172,7 @@ function yggInit () { printf "[INIT][GEM] found [ "$BOLDVERT"OK"$NORMAL" ] \n" fi + # SNAP if ! which snap >/dev/null; then printf "[INIT][SNAP] not found, installing...\n" printf "\n[INIT][SNAP] not found, installing...\n" &>> $logFile @@ -178,6 +181,7 @@ function yggInit () { printf "[INIT][SNAP] found [ "$BOLDVERT"OK"$NORMAL" ] \n" fi + # NPM if ! which npm >/dev/null; then printf "[INIT][NPM] not found, installing...\n" printf "\n[INIT][NPM] not found, installing...\n" &>> $logFile @@ -186,6 +190,7 @@ function yggInit () { printf "[INIT][NPM] found [ "$BOLDVERT"OK"$NORMAL" ] \n" fi + # PIP3 if ! which pip3 >/dev/null; then printf "[INIT][PIP] not found, installing...\n" printf "\n[INIT][PIP] not found, installing...\n" &>> $logFile From 040ee702138402c8f4fc2a62828393c0ff118b34 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 10:05:04 +0200 Subject: [PATCH 071/261] Key-ID updated --- install_functions_ub1604.sh | 25 +++++++++++++++++-------- install_functions_ub1804.sh | 25 +++++++++++++++++-------- 2 files changed, 34 insertions(+), 16 deletions(-) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index 36af055..77edb3e 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -556,15 +556,24 @@ function installTLPMenu () { installAppsFromListMenu tlp } -#TODO: +# +# Key-ID USB Fido U2F device udev rules +# function installKeyIDuDev () { - sudo sh -c "echo '# this udev file should be used with udev 188 and newer\n\ -ACTION!=\"add|change\", GOTO=\"u2f_end\"\n\ -\n\ -# Key-ID FIDO U2F\n\ -KERNEL==\"hidraw*\", SUBSYSTEM==\"hidraw\", ATTRS{idVendor}==\"096e\", ATTRS{idProduct}==\"0850|0880\", TAG+=\"uaccess\"\n\ -\n\ -LABEL=\"u2f_end\"' > /etc/udev/rules.d/70-u2f.rules" + printf "[CMD] Adding Key-ID device UDEV rules " + +cat << EOF | sudo tee /etc/udev/rules.d/70-u2f.rules +# this udev file should be used with udev 188 and newer\n\ +ACTION!="add|change", GOTO="u2f_end" + +# Key-ID FIDO U2F +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0850|0880", TAG+="uaccess" + +LABEL="u2f_end" +EOF + + ret_code=$? + retCode $ret_code runCmd "sudo service udev restart" \ "restarting UDEV service" diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index deff615..9ce53a0 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -524,15 +524,24 @@ function installTLPMenu () { installAppsFromListMenu tlp } -#TODO: +# +# Key-ID USB Fido U2F device udev rules +# function installKeyIDuDev () { - sudo sh -c "echo '# this udev file should be used with udev 188 and newer\n\ -ACTION!=\"add|change\", GOTO=\"u2f_end\"\n\ -\n\ -# Key-ID FIDO U2F\n\ -KERNEL==\"hidraw*\", SUBSYSTEM==\"hidraw\", ATTRS{idVendor}==\"096e\", ATTRS{idProduct}==\"0850|0880\", TAG+=\"uaccess\"\n\ -\n\ -LABEL=\"u2f_end\"' > /etc/udev/rules.d/70-u2f.rules" + printf "[CMD] Adding Key-ID device UDEV rules " + +cat << EOF | sudo tee /etc/udev/rules.d/70-u2f.rules +# this udev file should be used with udev 188 and newer\n\ +ACTION!="add|change", GOTO="u2f_end" + +# Key-ID FIDO U2F +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0850|0880", TAG+="uaccess" + +LABEL="u2f_end" +EOF + + ret_code=$? + retCode $ret_code runCmd "sudo service udev restart" \ "restarting UDEV service" From c053d40aa159c8866485962bf21b948815b0200b Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 10:11:13 +0200 Subject: [PATCH 072/261] microcode fct upd --- install_functions_ub1604.sh | 6 +++--- install_functions_ub1804.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index 77edb3e..728a4de 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -373,16 +373,16 @@ function installCardReaderMenu () { # function updateMicrocode () { msg "CPU Microcode updating" - oldMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` + oldMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` intel=`cat /proc/cpuinfo | grep -i Intel | wc -l` amd=`cat /proc/cpuinfo | grep -i Amd | wc -l` if [ "$intel" -gt "0" ]; then installPackage apt intel-microcode - newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" elif [ "$amd" -gt "0" ]; then installPackage apt amd64-microcode - newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" else printf "[INFO] No Intel/AMD CPU found" diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 9ce53a0..642347c 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -397,16 +397,16 @@ function installCardReaderMenu () { # function updateMicrocode () { msg "CPU Microcode updating" - oldMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` + oldMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` intel=`cat /proc/cpuinfo | grep -i Intel | wc -l` amd=`cat /proc/cpuinfo | grep -i Amd | wc -l` if [ "$intel" -gt "0" ]; then installPackage apt intel-microcode - newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" elif [ "$amd" -gt "0" ]; then installPackage apt amd64-microcode - newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1` + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" else printf "[INFO] No Intel/AMD CPU found" From 3ed5da010f684cf8b4de1872e34392b681afd055 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 13:37:59 +0200 Subject: [PATCH 073/261] angular cli + typescript added --- repo_functions_ub1604.sh | 15 ++++++++++++++- repo_functions_ub1804.sh | 15 ++++++++++++++- 2 files changed, 28 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 20e8011..f2c4288 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -382,6 +382,8 @@ javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn emma-cli;npm;javascript;emma-cli jshint;npm;javascript;jshint +typescript;npm;javascript;typescript +@angular/cli;npm;javascript;angularcli oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default php7.0-cli;apt;php;php7.0-cli @@ -1241,7 +1243,18 @@ mongodb;mongodb_PostTrtFct qttools5-dev-tools;qt_PostTrtFct plank;plank_PostTrtFct androidstudio;android_PostTrtFct -nodejs8lts;nodejs8lts_PostTrtFct" +nodejs8lts;nodejs8lts_PostTrtFct +angularcli;angularcli_PostTrtFct" + +# +# Angular CLI +# +function angularcli_PostTrtFct () { + if which yarn >/dev/null; then + runCmd "ng set --global packageManager=yarn" + "using yarn instead of nom for angular/cli" + fi +} # # NodeJS 8 LTS diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 7dddaf0..6533f66 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -312,6 +312,8 @@ javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn emma-cli;npm;javascript;emma-cli jshint;npm;javascript;jshint +typescript;npm;javascript;typescript +@angular/cli;npm;javascript;angularcli oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default php7.0-cli;apt;php;php7.0-cli @@ -1045,7 +1047,18 @@ mongodb;mongodb_PostTrtFct qttools5-dev-tools;qt_PostTrtFct plank;plank_PostTrtFct androidstudio;android_PostTrtFct -nodejs8lts;nodejs8lts_PostTrtFct" +nodejs8lts;nodejs8lts_PostTrtFct +angularcli;angularcli_PostTrtFct" + +# +# Angular CLI +# +function angularcli_PostTrtFct () { + if which yarn >/dev/null; then + runCmd "ng set --global packageManager=yarn" + "using yarn instead of nom for angular/cli" + fi +} # # NodeJS 8 LTS From 2c3a8074f8ab93f61f7d651cc11b82d61aad978c Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 13:39:08 +0200 Subject: [PATCH 074/261] comments fixed --- repo_functions_ub1604.sh | 2 +- repo_functions_ub1804.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index f2c4288..619be3b 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -1186,7 +1186,7 @@ function addRepo_AndroidStudio () { # # list of pre install functions -# fields : unique ID, function to process after install +# fields : unique ID, function to process before install # AppsPreTrtFct="opera-stable;opera_PreTrtFct steam;steam_PreTrtFct diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 6533f66..03f642d 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -991,7 +991,7 @@ function addRepo_AndroidStudio () { # # list of pre install functions -# fields : unique ID, function to process after install +# fields : unique ID, function to process before install # AppsPreTrtFct="opera-stable;opera_PreTrtFct steam;steam_PreTrtFct From 9095f286b44bb00817132f9c830094071b1f52ca Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 14:21:47 +0200 Subject: [PATCH 075/261] small change about var for ygginit --- vars.sh | 2 +- yggdrasil.sh | 44 ++++++++++++++++++++++---------------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/vars.sh b/vars.sh index fc71790..0cef925 100644 --- a/vars.sh +++ b/vars.sh @@ -39,7 +39,7 @@ repoAdded=0 # # ygginit flag for CLI mode # -ygginitCount=0 +ygginitCount=false # diff --git a/yggdrasil.sh b/yggdrasil.sh index 6933a49..68caca9 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -63,12 +63,12 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >> while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do case "$option" in a) # install all apps - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Installing Apps" installBase @@ -104,12 +104,12 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installXnViewMP ;; f) # full install - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Installing Apps" installBase @@ -150,101 +150,101 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installXnViewMP ;; c) # install themes and icons - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Installing Icons/Themes" installIcons installThemes ;; w) # nitrogen - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Installing Nitrogen" installNitrogen ;; d) # install Unbound DNS Cache - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Installing Unbound" installUnbound ;; q) # cardreader - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Installing Card Readers Apps" installCardReader ;; s) # solaar for logitech devices - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Installing Solaar" installSolaar ;; t) # tlp (laptop or low energy usage) - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Installing TLP" installTLP ;; n) # latest nvidia driver (see menus if need older version) - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Installing Nvidia Latest Driver" installNvidia396 ;; g) # latest feee graphic drivers, mesa, ... - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Installing Free Graphic Drivers" installOibaf ;; k) - if [ "$ygginitCount" -eq "0" ]; then + if [ $ygginitCount = false ]; then msg "Initializing" yggInit msg "Updating the system" updateSystem - ygginitCount=$(($ygginitCount+1)) + ygginitCount=true fi msg "Updating Kernel" kernelUpdate From 5c02d3c7da9270fa8a8abd27f0ae65cf37c0da66 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 14:29:41 +0200 Subject: [PATCH 076/261] small change to improve import libs --- yggdrasil.sh | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/yggdrasil.sh b/yggdrasil.sh index 68caca9..45e89e3 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -11,21 +11,21 @@ # include functions and vars from external files # dir=$(dirname $0) -source /opt/yggdrasil/vars.sh -source /opt/yggdrasil/core_functions.sh -source /opt/yggdrasil/tools_functions.sh +source /opt/yggdrasil/vars.sh || exit 1 +source /opt/yggdrasil/core_functions.sh || exit 1 +source /opt/yggdrasil/tools_functions.sh || exit 1 OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` case $OS in *"Ubuntu 16.04"* | *"Linux Mint 18"*) - source /opt/yggdrasil/repo_functions_ub1604.sh - source /opt/yggdrasil/install_functions_ub1604.sh - source /opt/yggdrasil/menus_functions_ub1604.sh + source /opt/yggdrasil/repo_functions_ub1604.sh || exit 1 + source /opt/yggdrasil/install_functions_ub1604.sh || exit 1 + source /opt/yggdrasil/menus_functions_ub1604.sh || exit 1 ;; *"Ubuntu 18.04"* | *"Linux Mint 19"*) - source /opt/yggdrasil/repo_functions_ub1804.sh - source /opt/yggdrasil/install_functions_ub1804.sh - source /opt/yggdrasil/menus_functions_ub1804.sh + source /opt/yggdrasil/repo_functions_ub1804.sh || exit 1 + source /opt/yggdrasil/install_functions_ub1804.sh || exit 1 + source /opt/yggdrasil/menus_functions_ub1804.sh || exit 1 ;; *) printf "\n" From 0ebb1bbbd328ed85ca9e4bac9d1ef6f9730c37e8 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 14:40:18 +0200 Subject: [PATCH 077/261] readme updated with new install procedure --- README.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 8e05058..7b7de42 100644 --- a/README.md +++ b/README.md @@ -10,11 +10,22 @@ The purpose of this script is to provide a full set of tools to install, customi Installation ------------ +Linux Mint 18 + ``` -git clone https://github.com/shakasan/yggdrasil_ng.git -cd yggdrasil_ng -chmod +x yggdrasil.sh -./yggdrasil.sh +curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - +echo "deb https://packagecloud.io/makoto/stable/ubuntu/ xenial main" | sudo tee /etc/apt/sources.list.d/makoto.list +sudo apt-get update +sudo apt-get install yggdrasil +``` + +Linux Mint 19 + +``` +curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - +echo "deb https://packagecloud.io/makoto/stable/ubuntu/ bionic main" | sudo tee /etc/apt/sources.list.d/makoto.list +sudo apt-get update +sudo apt-get install yggdrasil ``` Credits From f47c92d2fa2b2005e9edfb02a119376c14d6e0b4 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 14:58:25 +0200 Subject: [PATCH 078/261] source list file name changed for skype --- repo_functions_ub1604.sh | 2 +- repo_functions_ub1804.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 619be3b..39c3bf9 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -958,7 +958,7 @@ function addRepo_Telegram () { # function addRepo_SkypeForLinux () { addKey "https://repo.skype.com/data/SKYPE-GPG-KEY" - addRepo "skypeforlinux.list" \ + addRepo "skype-stable.list" \ "deb [arch=amd64] https://repo.skype.com/deb stable main" } diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 03f642d..30f42f4 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -763,7 +763,7 @@ function addRepo_Telegram () { # function addRepo_SkypeForLinux () { addKey "https://repo.skype.com/data/SKYPE-GPG-KEY" - addRepo "skypeforlinux.list" \ + addRepo "skype-stable.list" \ "deb [arch=amd64] https://repo.skype.com/deb stable main" } From 1305f24df30859db38a09396e5a5a3d1894b4f46 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 15:22:22 +0200 Subject: [PATCH 079/261] minor upd --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 7b7de42..bfd1a35 100644 --- a/README.md +++ b/README.md @@ -5,7 +5,7 @@ About !! Warnings : this is a early beta version !! -The purpose of this script is to provide a full set of tools to install, customize and tweak a fresh installation of Linux Mint 18.x, Ubuntu 16.04 and derivatives +The purpose of this script is to provide a full set of tools to install, customize and tweak a fresh installation of Linux Mint 18.x/19.x, Ubuntu 16.04/18.04 and derivatives Installation ------------ From 08ff6b7022d91b65f1d29f0942993a849e53ab23 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 16:10:42 +0200 Subject: [PATCH 080/261] libarc removed --- repo_functions_ub1804.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 30f42f4..19bba3d 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -266,7 +266,6 @@ numix-icon-theme-circle;apt;icons;numix-icon-theme-circle solaar;apt;solaar;solaar pcscd;apt;cardreader;pcscd pcsc-tools;apt;cardreader;pcsc-tools -libacr38u;apt;cardreader;libacr38u guvcview;apt;webcam;guvcview cheese;apt;webcam;cheese nvidia-384;apt;nvidia-384;nvidia-384 From 878f8f428e0448cf129b4b48d9973cb7e72cf2ab Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 16:17:12 +0200 Subject: [PATCH 081/261] syncthing-gtk added for 18.04 --- repo_functions_ub1804.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 19bba3d..fe2e104 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -104,6 +104,7 @@ peek;apt;multimedia;peek bino;apt;multimedia;bino owncloud-client;apt;internet;owncloud-client syncthing;apt;internet;syncthing +syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync discord;snap;internet;discord quiterss;apt;internet;quiterss @@ -387,6 +388,7 @@ vivaldi-stable;addRepo_Vivaldi virtualbox-5.2;addRepo_VirtualBox owncloud-client;addRepo_OwnCloud syncthing;addRepo_Syncthing +syncthinggtk;addRepo_SyncthingGtk opera-stable;addRepo_Opera insync;addRepo_Insync google-chrome-stable;addRepo_ChromeStable @@ -497,6 +499,15 @@ screenkey;addRepo_Webupd8 yad;addRepo_Webupd8 woeusb;addRepo_Webupd8" +# +# Syncthing-GTK +# +function addRepo_SyncthingGtk () { + addKey "https://download.opensuse.org/repositories/home:kozec/xUbuntu_18.04/Release.key" + addRepo syncthinggtk.list \ + "deb http://download.opensuse.org/repositories/home:/kozec/xUbuntu_18.04/ /" +} + # # Audacious, Guake # From 6b5580aa0372cbc97ea509f21caa08afed550b0a Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 16:25:21 +0200 Subject: [PATCH 082/261] cpu-g added for 18.04 --- repo_functions_ub1804.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index fe2e104..50d284e 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -125,6 +125,7 @@ deluge-torrent;apt;internet;deluge-torrent vivaldi-stable;apt;internet;vivaldi-stable transmission-gtk;apt;internet;transmission-gtk qtqr;apt;utilities;qtqr +cpu-g;apt;utilities;cpu-g screenfetch;apt;utilities;screenfetch xcalib;apt;utilities;xcalib conky-all;apt;utilities;conky-all @@ -497,7 +498,15 @@ audacious;addRepo_Webupd8 qt5ct;addRepo_Webupd8 screenkey;addRepo_Webupd8 yad;addRepo_Webupd8 -woeusb;addRepo_Webupd8" +woeusb;addRepo_Webupd8 +cpu-g;addRepo_Atareao" + +# +# Atareao ppa +# +function addRepo_Atareao () { + addPPA ppa:atareao/atareao +} # # Syncthing-GTK From 5d805f0d7015cf78fdbd51fbefe4ce76a7e226f9 Mon Sep 17 00:00:00 2001 From: Francois B Date: Tue, 5 Jun 2018 16:29:36 +0200 Subject: [PATCH 083/261] shotcut added for 18.04 by snap --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 50d284e..c3ac020 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -43,6 +43,7 @@ spotify;snap;multimedia;spotify sayonara;apt;multimedia;sayonara qmmp;apt;multimedia;qmmp qmmp-plugin-projectm;apt;multimedia;qmmp-plugin-projectm +shotcut;snap;multimedia;shotcut audacious;apt;multimedia;audacious dia;apt;multimedia;dia mpv;apt;multimedia;mpv From 2562e9fd836c8e8e3e121d6f27fc1bcd977f7dcf Mon Sep 17 00:00:00 2001 From: Francois B Date: Wed, 6 Jun 2018 08:46:16 +0200 Subject: [PATCH 084/261] zeal ppa removed --- repo_functions_ub1804.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index c3ac020..491030c 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -418,7 +418,6 @@ flacon;addRepo_Flacon y-ppa-manager;addRepo_YPPAManager diodon;addRepo_Diodon sayonara;addRepo_Sayonara -zeal;addRepo_Zeal corebird;addRepo_Corebird deluge-torrent;addRepo_Deluge deluge-gtk;addRepo_Deluge @@ -673,13 +672,6 @@ function addRepo_Corebird () { addPPA ppa:ubuntuhandbook1/corebird } -# -# Zeal -# -function addRepo_Zeal () { - addPPA ppa:zeal-developers/ppa -} - # # Sayonara # From 5f9eae4971a9b12a7631623207714101c0e6f936 Mon Sep 17 00:00:00 2001 From: Francois B Date: Wed, 6 Jun 2018 09:02:07 +0200 Subject: [PATCH 085/261] dockerio instead of docker-ce + agave removed --- repo_functions_ub1804.sh | 18 ++++++++++++++---- 1 file changed, 14 insertions(+), 4 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 491030c..d2d9749 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -289,7 +289,6 @@ nvidia-settings;apt;nvidia-driver-396;nvidia-settings nvidia-utils-396;apt;nvidia-driver-396;nvidia-utils-396 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq -agave;apt;dev;agave gpick;apt;dev;gpick virtualbox-5.2;apt;dev;virtualbox-5.2 build-essential;apt;dev;build-essential @@ -304,7 +303,7 @@ shellcheck;apt;dev;shellcheck umbrello;apt;dev;umbrello ack-grep;apt;dev;ack-grep ansible;apt;dev;ansible -docker-ce;apt;dev;docker-ce +docker.io;apt;dev;dockerio remark-lint;npm;dev;remark-lint beautysh;pip;dev;beautysh mycli;pip;dev;mycli @@ -1060,14 +1059,25 @@ qttools5-dev-tools;qt_PostTrtFct plank;plank_PostTrtFct androidstudio;android_PostTrtFct nodejs8lts;nodejs8lts_PostTrtFct -angularcli;angularcli_PostTrtFct" +angularcli;angularcli_PostTrtFct +dockerio;dockerio_PostTrtFct" + +# +# +# +function dockerio_PostTrtFct () { + runCmd "sudo systemctl start docker" \ + "start docker service" + runCmd "sudo systemctl enable docker" \ + "add docker service at boot" +} # # Angular CLI # function angularcli_PostTrtFct () { if which yarn >/dev/null; then - runCmd "ng set --global packageManager=yarn" + runCmd "ng set --global packageManager=yarn" \ "using yarn instead of nom for angular/cli" fi } From 3613b1bd29f5e3a7b4d9dcc51e952a3dcd1a772d Mon Sep 17 00:00:00 2001 From: Francois B Date: Wed, 6 Jun 2018 09:19:20 +0200 Subject: [PATCH 086/261] mongodb fixed --- repo_functions_ub1804.sh | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index d2d9749..64f6c6b 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -947,7 +947,7 @@ function addRepo_Gyazo () { function addRepo_MongoDB3CE () { addKey "https://www.mongodb.org/static/pgp/server-3.6.asc" addRepo "mongodb-org-3.6.list" \ - "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/3.6 multiverse" + "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" } # @@ -1086,7 +1086,6 @@ function angularcli_PostTrtFct () { # NodeJS 8 LTS # function nodejs8lts_PostTrtFct () { - msg "Sanitizing NodeJS install" if which /usr/local/bin/node >/dev/null; then runCmd "sudo rm /usr/local/bin/node" \ "cleaning/removing legacy node files" From c4cfd08c195f968b33afeeac5141738546c1f67a Mon Sep 17 00:00:00 2001 From: Francois B Date: Wed, 6 Jun 2018 09:33:07 +0200 Subject: [PATCH 087/261] php 7 -> 7.2 --- repo_functions_ub1804.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 64f6c6b..9ef0e62 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -317,7 +317,7 @@ typescript;npm;javascript;typescript @angular/cli;npm;javascript;angularcli oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default -php7.0-cli;apt;php;php7.0-cli +php7.2-cli;apt;php;php7.2-cli php-pear;apt;php;php-pear composer;apt;php;composer luajit;apt;lua;luajit From 076781657a537246a7e61cb38b7f07763e737eee Mon Sep 17 00:00:00 2001 From: Francois B Date: Wed, 6 Jun 2018 10:05:15 +0200 Subject: [PATCH 088/261] geany md plugin removed --- repo_functions_ub1804.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 9ef0e62..d24a520 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -329,7 +329,6 @@ codeblocks;apt;codeblocks;codeblocks codeblocks-contrib;apt;codeblocks;codeblocks-contrib geany;apt;geany;geany geany-plugins;apt;geany;geany-plugins -geany-plugin-markdown;apt;geany;geany-plugin-markdown pycharm-community;snap;pycharm;pycharm sublime-text;apt;sublime-text;sublime-text kicad;apt;cad;kicad From 9d40ba995a17ebb1f23106b43db521e7a46b5362 Mon Sep 17 00:00:00 2001 From: Francois B Date: Wed, 6 Jun 2018 11:27:51 +0200 Subject: [PATCH 089/261] version upd to beta 4 --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 0cef925..d5cd8f3 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b3" +version="0.5.0-b4" # # myHomedir is used in full paths to the homedir From 596786ea91107eb8fa195cdb85216c0dc46f5a47 Mon Sep 17 00:00:00 2001 From: Francois B Date: Wed, 6 Jun 2018 15:23:36 +0200 Subject: [PATCH 090/261] whatismyip added --- repo_functions_ub1604.sh | 1 + repo_functions_ub1804.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 39c3bf9..a46582e 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -218,6 +218,7 @@ speedtest-cli;pip;nettools;speedtest-cli whatportis;pip;nettools;whatportis nethogs;apt;nettools;nethogs ssh_scan;gem;nettools;sshscan +whatismyip;npm;nettools;whatismyip caja-share;apt;cajaplugins;caja-share caja-wallpaper;apt;cajaplugins;caja-wallpaper caja-sendto;apt;cajaplugins;caka-sendto diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index d24a520..8109693 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -200,6 +200,7 @@ SpoofMAC;pip;nettools;SpoofMAC speedtest-cli;pip;nettools;speedtest-cli nethogs;apt;nettools;nethogs ssh_scan;gem;nettools;sshscan +whatismyip;npm;nettools;whatismyip caja-share;apt;cajaplugins;caja-share caja-wallpaper;apt;cajaplugins;caja-wallpaper caja-sendto;apt;cajaplugins;caka-sendto From 1d4494abcf03923cb37a9ab9a95a751e7f6198cb Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 9 Jun 2018 01:05:02 +0200 Subject: [PATCH 091/261] add missing hardware menu entry --- yggdrasil.sh | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) diff --git a/yggdrasil.sh b/yggdrasil.sh index 45e89e3..3814a2e 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -322,10 +322,11 @@ mainMenuOptions=$(whiptail \ "5" "Themes & Icons" \ "6" "Dev Apps" \ "7" "System Config" \ -"8" "System Tools" \ -"9" "Reboot this computer" \ -"10" "About Yggdrasil" \ -"11" "Quit" 3>&1 1>&2 2>&3) +"8" "Hardware" \ +"9" "System Tools" \ +"10" "Reboot this computer" \ +"11" "About Yggdrasil" \ +"12" "Quit" 3>&1 1>&2 2>&3) case $mainMenuOptions in "1") @@ -351,15 +352,18 @@ case $mainMenuOptions in showConfigMenu; ;; "8") - showSysToolsMenu + showHardwareMenu ;; "9") - showRebootBoxMenu + showSysToolsMenu ;; "10") - showAboutBoxMenu + showRebootBoxMenu ;; "11") + showAboutBoxMenu + ;; + "12") exit ;; esac # main menu From 5b1f69cdf7e2bc902c5c42de390b2d2ba0b95e85 Mon Sep 17 00:00:00 2001 From: Francois B Date: Sat, 9 Jun 2018 01:47:59 +0200 Subject: [PATCH 092/261] small ui change --- menus_functions_ub1604.sh | 2 ++ menus_functions_ub1804.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh index 12794b4..08d2bc0 100644 --- a/menus_functions_ub1604.sh +++ b/menus_functions_ub1604.sh @@ -468,9 +468,11 @@ function showHardwareMenu () { ;; "keyid") installKeyIDuDev + pressKey ;; "WI6320") fixWirelessIntel6320 + pressKey ;; "Back") break diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index d3ebd7e..3a774aa 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -452,9 +452,11 @@ function showHardwareMenu () { ;; "keyid") installKeyIDuDev + pressKey ;; "WI6320") fixWirelessIntel6320 + pressKey ;; "Back") break From ecad0e51ddd52c501c6e7741c7bfa73dc2b80f8f Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 10 Jun 2018 18:08:54 +0200 Subject: [PATCH 093/261] qt5designer shortcut removed for 18.04 --- repo_functions_ub1804.sh | 7 ------- 1 file changed, 7 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 8109693..07cf547 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1183,13 +1183,6 @@ function plank_PostTrtFct () { function qt_PostTrtFct () { runCmd "sudo ln -s /usr/share/qtchooser/qt5-x86_64-linux-gnu.conf /usr/lib/x86_64-linux-gnu/qtchooser/default.conf" \ "set QT5 as default" - - createAppShortcut "/usr/bin/designer" \ - "" \ - "GNOME;GTK;Development;IDE" \ - "QT Designer 5" \ - "local" \ - update-menus } # From 726aad38ce38d62a1befb43eb36dd63cbe6bed7d Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 10 Jun 2018 18:16:02 +0200 Subject: [PATCH 094/261] atom sync by apm removed --- repo_functions_ub1604.sh | 1 - repo_functions_ub1804.sh | 1 - 2 files changed, 2 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index a46582e..069594a 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -408,7 +408,6 @@ librecad;apt;cad;librecad freecad;apt;cad;freecad code;apt;code;code atom;apt;atom;atom -sync-settings;apm;atom;sync-settings sqlparse;pip;atom;sqlparse flake8;pip;atom;flake8 autopep8;pip;atom;autopep8 diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 07cf547..ffe1bcb 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -338,7 +338,6 @@ librecad;apt;cad;librecad freecad;apt;cad;freecad code;apt;code;code atom;apt;atom;atom -sync-settings;apm;atom;sync-settings sqlparse;pip;atom;sqlparse flake8;pip;atom;flake8 autopep8;pip;atom;autopep8 From 656dce15e1c3d0fb9161fcc620538db1ed8ef561 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 10 Jun 2018 18:17:24 +0200 Subject: [PATCH 095/261] mysql-workbench added --- repo_functions_ub1604.sh | 1 + repo_functions_ub1804.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 069594a..6f2495e 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -378,6 +378,7 @@ remark-lint;npm;dev;remark-lint beautysh;pip;dev;beautysh mycli;pip;dev;mycli sqlitebrowser;apt;dev;sqlitebrowser +mysql-workbench;apt;dev;mysql-workbench nodejs;apt;javascript;nodejs8lts javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index ffe1bcb..c42dbd6 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -309,6 +309,7 @@ remark-lint;npm;dev;remark-lint beautysh;pip;dev;beautysh mycli;pip;dev;mycli sqlitebrowser;apt;dev;sqlitebrowser +mysql-workbench;apt;dev;mysql-workbench nodejs;apt;javascript;nodejs8lts javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn From 022badf4b702f658ff572e3b7e4b2f066ba3fc3c Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 10 Jun 2018 18:24:08 +0200 Subject: [PATCH 096/261] thunar + plugins added --- install_functions_ub1604.sh | 14 ++++++++++++++ install_functions_ub1804.sh | 14 ++++++++++++++ menus_functions_ub1604.sh | 4 ++++ menus_functions_ub1804.sh | 4 ++++ repo_functions_ub1604.sh | 4 ++++ repo_functions_ub1804.sh | 4 ++++ yggdrasil.sh | 2 ++ 7 files changed, 46 insertions(+) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index 728a4de..7c4c74d 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -228,6 +228,20 @@ function installNautilusAndPluginsMenu () { installAppsFromListMenu nautilus } +# +# install Thunar + Plugins (headless) +# +function installThunar () { + installAppsFromList thunar +} + +# +# install Thunar + Plugins (Menu) +# +function installThunarMenu () { + installAppsFromListMenu thunar +} + # # install Gimp plugins (headless) # diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 642347c..51aa97a 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -252,6 +252,20 @@ function installNautilusAndPluginsMenu () { installAppsFromListMenu nautilus } +# +# install Thunar + Plugins (headless) +# +function installThunar () { + installAppsFromList thunar +} + +# +# install Thunar + Plugins (Menu) +# +function installThunarMenu () { + installAppsFromListMenu thunar +} + # # install Gimp plugins (headless) # diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh index 08d2bc0..1c5146f 100644 --- a/menus_functions_ub1604.sh +++ b/menus_functions_ub1604.sh @@ -316,6 +316,7 @@ function showAppInstallMenu () { "nettools" "Network tools" \ "cajaplugins" "Caja Plugins" \ "nautilus" "Nautilus and plugins" \ + "thunar" "Thunar file manager" \ "gimp" "Gimp plugins" \ "rhythmbox" "RhythmBox plugins" \ "pidgin" "Pidgin plugins" \ @@ -355,6 +356,9 @@ function showAppInstallMenu () { "nautilus") installNautilusAndPluginsMenu ;; + "thunar") + installThunarMenu + ;; "gimp") installGimpPluginsMenu ;; diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 3a774aa..f0d3ee2 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -316,6 +316,7 @@ function showAppInstallMenu () { "nettools" "Network tools" \ "cajaplugins" "Caja Plugins" \ "nautilus" "Nautilus and plugins" \ + "thunar" "Thunar file manager" \ "gimp" "Gimp plugins" \ "rhythmbox" "RhythmBox plugins" \ "pidgin" "Pidgin plugins" \ @@ -355,6 +356,9 @@ function showAppInstallMenu () { "nautilus") installNautilusAndPluginsMenu ;; + "thunar") + installThunarMenu + ;; "gimp") installGimpPluginsMenu ;; diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 6f2495e..3fcd1c7 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -245,6 +245,10 @@ nautilus-dropbox;apt;nautilus;nautilus-dropbox nautilus-script-manager;apt;nautilus;nautilus-script-manager nautilus-columns;apt;nautilus;nautilus-columns insync-nautilus;apt;nautilus;insync-nautilus +thunar;apt;thunar;thunar +thunar-archive-plugin;apt;thunar;thunar-archive-plugin +thunar-gtkhash;apt;thunar;thunar-gtkhash +thunar-volman;apt;thunar;thunar-volman gtkam-gimp;apt;gimp;gtkam-gimp gimp-gluas;apt;gimp;gimp-gluas pandora;apt;gimp;pandora diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index c42dbd6..e4d9776 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -223,6 +223,10 @@ ooo-thumbnailer;apt;nautilus;ooo-thumbnailer nautilus-dropbox;apt;nautilus;nautilus-dropbox nautilus-script-manager;apt;nautilus;nautilus-script-manager insync-nautilus;apt;nautilus;insync-nautilus +thunar;apt;thunar;thunar +thunar-archive-plugin;apt;thunar;thunar-archive-plugin +thunar-gtkhash;apt;thunar;thunar-gtkhash +thunar-volman;apt;thunar;thunar-volman gtkam-gimp;apt;gimp;gtkam-gimp gimp-gluas;apt;gimp;gimp-gluas pandora;apt;gimp;pandora diff --git a/yggdrasil.sh b/yggdrasil.sh index 3814a2e..26ac271 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -85,6 +85,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installWine installCajaPlugins installNautilusAndPlugins + installThunar installGimpPlugins installPidginPlugins installRhythmBoxPlugins @@ -126,6 +127,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do installWine installCajaPlugins installNautilusAndPlugins + installThunar installGimpPlugins installPidginPlugins installRhythmBoxPlugins From bf2e4fc9bbc49cb27f8c507359ff2f8495467a6a Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 10 Jun 2018 18:34:02 +0200 Subject: [PATCH 097/261] arch amd64 only for vbox repo --- repo_functions_ub1804.sh | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index e4d9776..088619d 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -888,7 +888,7 @@ function addRepo_VirtualBox () { addKey "http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc" addKey "http://download.virtualbox.org/virtualbox/debian/oracle_vbox_2016.asc" addRepo virtualbox.list \ - "deb http://download.virtualbox.org/virtualbox/debian bionic contrib" + "deb [arch=amd64] http://download.virtualbox.org/virtualbox/debian bionic contrib" } # @@ -954,15 +954,6 @@ function addRepo_MongoDB3CE () { "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" } -# -# Wine Build -# -# function addRepo_Wine () { -# addKey "https://dl.winehq.org/wine-builds/Release.key" -# addRepo "winehq.list" \ -# "deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main" -#} - # # LibreOffice 6 # From e331c77b463ceec01961772803f6b37c9ef2668c Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 10 Jun 2018 18:42:25 +0200 Subject: [PATCH 098/261] ppa oibaf removed, not reliable ? --- core_functions.sh | 1 - menus_functions_ub1604.sh | 4 ---- menus_functions_ub1804.sh | 4 ---- repo_functions_ub1604.sh | 9 --------- repo_functions_ub1804.sh | 9 --------- yggdrasil.sh | 13 +------------ 6 files changed, 1 insertion(+), 39 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 127ccc6..ef153f4 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -631,7 +631,6 @@ 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"-n"$NORMAL" : install lastest Nvidia graphic drivers\n" - printf " "$BOLDVERT"-g"$NORMAL" : install lastest free graphic drivers (nouveau, amdgpu, ati, intel), mesa, ...\n" printf " "$BOLDVERT"-k"$NORMAL" : update system to the latest kernel\n" printf " "$BOLDVERT"-u"$NORMAL" : update system (apt,snap,...)\n" printf " "$BOLDVERT"-p"$NORMAL" : clean useless packages\n" diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh index 1c5146f..d247640 100644 --- a/menus_functions_ub1604.sh +++ b/menus_functions_ub1604.sh @@ -413,7 +413,6 @@ function showHardwareMenu () { "solaar" "Solaar for Logitech Unifying devices" \ "webcam" "Install webcam neede apps" \ "microcode" "Update Intel/AMD CPU microcode" \ - "oibaf" "latest version of free graphic drivers, mesa, ..." \ "nvidia370" "Install Nvidia 370 graphic drivers" \ "nvidia375" "Install Nvidia 375 graphic drivers" \ "nvidia378" "Install Nvidia 378 graphic drivers" \ @@ -440,9 +439,6 @@ function showHardwareMenu () { "microcode") updateMicrocode ;; - "oibaf") - installOibafMenu - ;; "nvidia370") installNvidia370Menu ;; diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index f0d3ee2..9b608ca 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -413,7 +413,6 @@ function showHardwareMenu () { "solaar" "Solaar for Logitech Unifying devices" \ "webcam" "Install webcam neede apps" \ "microcode" "Update Intel/AMD CPU microcode" \ - "oibaf" "latest version of free graphic drivers, mesa, ..." \ "nvidia384" "Install Nvidia 384 graphic drivers" \ "nvidia387" "Install Nvidia 387 graphic drivers" \ "nvidia390" "Install Nvidia 390 graphic drivers" \ @@ -436,9 +435,6 @@ function showHardwareMenu () { "microcode") updateMicrocode ;; - "oibaf") - installOibafMenu - ;; "nvidia384") installNvidia384Menu ;; diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 3fcd1c7..8453332 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -660,15 +660,6 @@ function addRepo_DhorMyWay () { addPPA ppa:dhor/myway } -# -# Oibaf -# - newest versions of free/open GPU drivers -# - newest versions of Mesa, .... -# -function addRepo_Oibaf () { - addPPA ppa:oibaf/graphics-drivers -} - # # Nvidia drivers # diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 088619d..9081d73 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -553,15 +553,6 @@ function addRepo_DhorMyWay () { addPPA ppa:dhor/myway } -# -# Oibaf -# - newest versions of free/open GPU drivers -# - newest versions of Mesa, .... -# -function addRepo_Oibaf () { - addPPA ppa:oibaf/graphics-drivers -} - # # Nvidia drivers # diff --git a/yggdrasil.sh b/yggdrasil.sh index 26ac271..b32a634 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -60,7 +60,7 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >> # # arguments/options management with getopts -while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do +while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do case "$option" in a) # install all apps if [ $ygginitCount = false ]; then @@ -229,17 +229,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,g,w,p,k,T" option; do msg "Installing Nvidia Latest Driver" installNvidia396 ;; - g) # latest feee graphic drivers, mesa, ... - if [ $ygginitCount = false ]; then - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem - ygginitCount=true - fi - msg "Installing Free Graphic Drivers" - installOibaf - ;; k) if [ $ygginitCount = false ]; then msg "Initializing" From 9029be5fc81797e6b11a0e770dda6020624083f9 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 10 Jun 2018 21:19:48 +0200 Subject: [PATCH 099/261] some ruby package added --- repo_functions_ub1604.sh | 2 ++ repo_functions_ub1804.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 8453332..976a96a 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -397,6 +397,8 @@ php-pear;apt;php;php-pear composer;apt;php;composer luajit;apt;lua;luajit ruby-dev;apt;ruby;ruby-dev +ruby-full;apt;ruby;ruby-full +ruby-rainbow;apt;ruby;ruby-rainbow anjuta;apt;anjuta;anjuta anjuta-extras;apt;anjuta;anjuta-extras brackets;apt;brackets;brackets diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 9081d73..80b1e44 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -328,6 +328,8 @@ php-pear;apt;php;php-pear composer;apt;php;composer luajit;apt;lua;luajit ruby-dev;apt;ruby;ruby-dev +ruby-full;apt;ruby;ruby-full +ruby-rainbow;apt;ruby;ruby-rainbow anjuta;apt;anjuta;anjuta anjuta-extras;apt;anjuta;anjuta-extras brackets;apt;brackets;brackets From 5093eb0889294b8d0424f6c4ee852cf12d1b1ac3 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 00:12:11 +0200 Subject: [PATCH 100/261] ionic + cordova added to JS Dev --- repo_functions_ub1604.sh | 2 ++ repo_functions_ub1804.sh | 2 ++ 2 files changed, 4 insertions(+) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 976a96a..a0e13cf 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -390,6 +390,8 @@ emma-cli;npm;javascript;emma-cli jshint;npm;javascript;jshint typescript;npm;javascript;typescript @angular/cli;npm;javascript;angularcli +ionic;npm;javascript;ionic +cordova;npm;javascript;cordova oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default php7.0-cli;apt;php;php7.0-cli diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 80b1e44..d8f3ec7 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -321,6 +321,8 @@ emma-cli;npm;javascript;emma-cli jshint;npm;javascript;jshint typescript;npm;javascript;typescript @angular/cli;npm;javascript;angularcli +ionic;npm;javascript;ionic +cordova;npm;javascript;cordova oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default php7.2-cli;apt;php;php7.2-cli From 0ff864d6525c8bc00f0759961ed2ee31fa311117 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 00:15:35 +0200 Subject: [PATCH 101/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index d5cd8f3..f4d191c 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b4" +version="0.5.0-b5" # # myHomedir is used in full paths to the homedir From 89c01a326c5272fbe0a229cd8ed66a0c5e177911 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 08:53:25 +0200 Subject: [PATCH 102/261] Franz updated to 5.0.0-beta.18 --- install_functions_ub1604.sh | 4 ++-- install_functions_ub1804.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index 7c4c74d..232252e 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -102,7 +102,7 @@ function installViberMenu () { # Franz (headless) # function installFranz () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.17/franz_5.0.0-beta.17_amd64.deb \ + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.18/franz_5.0.0-beta.18_amd64.deb \ franz.deb \ no } @@ -111,7 +111,7 @@ function installFranz () { # Franz (Menu) # function installFranzMenu () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.17/franz_5.0.0-beta.17_amd64.deb \ + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.18/franz_5.0.0-beta.18_amd64.deb \ franz.deb \ yes } diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 51aa97a..452731e 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -108,7 +108,7 @@ function installViberMenu () { # Franz (headless) # function installFranz () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.17/franz_5.0.0-beta.17_amd64.deb \ + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.18/franz_5.0.0-beta.18_amd64.deb \ franz.deb \ no } @@ -117,7 +117,7 @@ function installFranz () { # Franz (Menu) # function installFranzMenu () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.17/franz_5.0.0-beta.17_amd64.deb \ + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.18/franz_5.0.0-beta.18_amd64.deb \ franz.deb \ yes } From 0fdc714f5c4d16892e13a5035c07e4480c7459cc Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 08:58:12 +0200 Subject: [PATCH 103/261] Boostnotes added to cli opt --- install_functions_ub1604.sh | 18 ++++++++++++++++++ install_functions_ub1804.sh | 18 ++++++++++++++++++ yggdrasil.sh | 2 ++ 3 files changed, 38 insertions(+) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index 232252e..33ceef8 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -116,6 +116,24 @@ function installFranzMenu () { yes } +# +# Boostnotes (headless) +# +function installBoostnotes () { + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ + boostnotes.deb \ + no +} + +# +# Boostnotes (Menu) +# +function installBoostnotesMenu () { + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ + boostnotes.deb \ + yes +} + # # install Misc Utilities Apps (headless) # diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 452731e..e63d7dd 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -122,6 +122,24 @@ function installFranzMenu () { yes } +# +# Boostnotes (headless) +# +function installBoostnotes () { + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ + boostnotes.deb \ + no +} + +# +# Boostnotes (Menu) +# +function installBoostnotesMenu () { + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ + boostnotes.deb \ + yes +} + # # XnViewMP (headless) # diff --git a/yggdrasil.sh b/yggdrasil.sh index b32a634..1552aff 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -101,6 +101,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do msg "Installing external apps" installViber installFranz + installBoostnotes installTeamViewer13 installXnViewMP ;; @@ -148,6 +149,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do msg "Installing external apps" installViber installFranz + installBoostnotes installTeamViewer13 installXnViewMP ;; From f740ddb2288f667e9a616b63b48a13d4c97c80e4 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 09:09:01 +0200 Subject: [PATCH 104/261] Boostnotes + Franz added to menus --- menus_functions_ub1604.sh | 8 ++++++++ menus_functions_ub1804.sh | 7 +++++++ 2 files changed, 15 insertions(+) diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh index d247640..614e94f 100644 --- a/menus_functions_ub1604.sh +++ b/menus_functions_ub1604.sh @@ -219,6 +219,7 @@ function showDevInstallMenu () { "sublimetext" "Sublime Text" \ "cad" "CAD tools" \ "teamviewer13" "Teamviewer 13" \ + "boostnotes" "Boostnotes Markdown wiki app" \ "Back" "Back" 3>&1 1>&2 2>&3) case $devInstallMenuOptions in @@ -288,6 +289,9 @@ function showDevInstallMenu () { "teamviewer13") installTeamViewer13Menu ;; + "boostnotes") + installBoostnotesMenu + ;; "Back") break ;; @@ -323,6 +327,7 @@ function showAppInstallMenu () { "nitrogen" "Nitrogen WP Manager" \ "wine" "Wine Builds" \ "viber" "Viber IM desktop app" \ + "franz" "Franz, Multi IM app" \ "Back" "Back" 3>&1 1>&2 2>&3) case $appsInstallMenuOptions in @@ -377,6 +382,9 @@ function showAppInstallMenu () { "viber") installViberMenu ;; + "franz") + installFranzMenu + ;; "Back") break ;; diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 9b608ca..365ceb3 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -219,6 +219,7 @@ function showDevInstallMenu () { "sublimetext" "Sublime Text" \ "cad" "CAD tools" \ "teamviewer13" "Teamviewer 13" \ + "boostnotes" "Boostnotes Markdown wiki app" \ "Back" "Back" 3>&1 1>&2 2>&3) case $devInstallMenuOptions in @@ -288,6 +289,9 @@ function showDevInstallMenu () { "teamviewer13") installTeamViewer13Menu ;; + "boostnotes") + installBoostnotesMenu + ;; "Back") break ;; @@ -377,6 +381,9 @@ function showAppInstallMenu () { "viber") installViberMenu ;; + "franz") + installFranzMenu + ;; "Back") break ;; From 7421bfac60f3062ed4974a4a3ac57ff28aab5954 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 09:14:11 +0200 Subject: [PATCH 105/261] MongoDB Compass added --- install_functions_ub1604.sh | 18 ++++++++++++++++++ install_functions_ub1804.sh | 18 ++++++++++++++++++ menus_functions_ub1604.sh | 4 ++++ menus_functions_ub1804.sh | 4 ++++ 4 files changed, 44 insertions(+) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index 33ceef8..a05fc74 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -933,6 +933,24 @@ function installTeamViewer13Menu () { yes } +# +# install Compass (headless) +# +function installCompass () { + installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.13.1_amd64.deb \ + compass.deb \ + no +} + +# +# install Compass (Menu) +# +function installCompassMenu () { + installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.13.1_amd64.deb \ + compass.deb \ + yes +} + # # install/enable Unboud (headless) # diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index e63d7dd..81ec731 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -892,6 +892,24 @@ function installTeamViewer13Menu () { yes } +# +# install Compass (headless) +# +function installCompass () { + installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.13.1_amd64.deb \ + compass.deb \ + no +} + +# +# install Compass (Menu) +# +function installCompassMenu () { + installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.13.1_amd64.deb \ + compass.deb \ + yes +} + # # install/enable Unboud (headless) # diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh index 614e94f..1104c5e 100644 --- a/menus_functions_ub1604.sh +++ b/menus_functions_ub1604.sh @@ -220,6 +220,7 @@ function showDevInstallMenu () { "cad" "CAD tools" \ "teamviewer13" "Teamviewer 13" \ "boostnotes" "Boostnotes Markdown wiki app" \ + "compass" "MongoDB Compass GUI" \ "Back" "Back" 3>&1 1>&2 2>&3) case $devInstallMenuOptions in @@ -292,6 +293,9 @@ function showDevInstallMenu () { "boostnotes") installBoostnotesMenu ;; + "compass") + installCompassMenu + ;; "Back") break ;; diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 365ceb3..7266b3a 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -220,6 +220,7 @@ function showDevInstallMenu () { "cad" "CAD tools" \ "teamviewer13" "Teamviewer 13" \ "boostnotes" "Boostnotes Markdown wiki app" \ + "compass" "MongoDB Compass GUI" \ "Back" "Back" 3>&1 1>&2 2>&3) case $devInstallMenuOptions in @@ -292,6 +293,9 @@ function showDevInstallMenu () { "boostnotes") installBoostnotesMenu ;; + "compass") + installCompassMenu + ;; "Back") break ;; From 4c5dabfcedf15450d916aca2de44348b7184e6c4 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 09:18:24 +0200 Subject: [PATCH 106/261] Slack App added --- install_functions_ub1604.sh | 34 ++++++++++++++++++++++++++-------- install_functions_ub1804.sh | 34 ++++++++++++++++++++++++++-------- menus_functions_ub1604.sh | 4 ++++ menus_functions_ub1804.sh | 4 ++++ 4 files changed, 60 insertions(+), 16 deletions(-) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index a05fc74..493c079 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -117,20 +117,20 @@ function installFranzMenu () { } # -# Boostnotes (headless) +# Slack (headless) # -function installBoostnotes () { - installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ - boostnotes.deb \ +function installSlack () { + installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.2.1-amd64.deb \ + slack.deb \ no } # -# Boostnotes (Menu) +# Slack (Menu) # -function installBoostnotesMenu () { - installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ - boostnotes.deb \ +function installSlackMenu () { + installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.2.1-amd64.deb \ + slack.deb \ yes } @@ -933,6 +933,24 @@ function installTeamViewer13Menu () { yes } +# +# Boostnotes (headless) +# +function installBoostnotes () { + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ + boostnotes.deb \ + no +} + +# +# Boostnotes (Menu) +# +function installBoostnotesMenu () { + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ + boostnotes.deb \ + yes +} + # # install Compass (headless) # diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 81ec731..ca36874 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -123,20 +123,20 @@ function installFranzMenu () { } # -# Boostnotes (headless) +# Slack (headless) # -function installBoostnotes () { - installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ - boostnotes.deb \ +function installSlack () { + installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.2.1-amd64.deb \ + slack.deb \ no } # -# Boostnotes (Menu) +# Slack (Menu) # -function installBoostnotesMenu () { - installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ - boostnotes.deb \ +function installSlackMenu () { + installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.2.1-amd64.deb \ + slack.deb \ yes } @@ -910,6 +910,24 @@ function installCompassMenu () { yes } +# +# Boostnotes (headless) +# +function installBoostnotes () { + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ + boostnotes.deb \ + no +} + +# +# Boostnotes (Menu) +# +function installBoostnotesMenu () { + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ + boostnotes.deb \ + yes +} + # # install/enable Unboud (headless) # diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh index 1104c5e..731ae05 100644 --- a/menus_functions_ub1604.sh +++ b/menus_functions_ub1604.sh @@ -332,6 +332,7 @@ function showAppInstallMenu () { "wine" "Wine Builds" \ "viber" "Viber IM desktop app" \ "franz" "Franz, Multi IM app" \ + "slack" "Slack App" \ "Back" "Back" 3>&1 1>&2 2>&3) case $appsInstallMenuOptions in @@ -389,6 +390,9 @@ function showAppInstallMenu () { "franz") installFranzMenu ;; + "slack") + installSlackMenu + ;; "Back") break ;; diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 7266b3a..4063730 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -331,6 +331,7 @@ function showAppInstallMenu () { "nitrogen" "Nitrogen WP Manager" \ "wine" "Wine Builds" \ "viber" "Viber IM desktop app" \ + "slack" "Slack App" \ "Back" "Back" 3>&1 1>&2 2>&3) case $appsInstallMenuOptions in @@ -388,6 +389,9 @@ function showAppInstallMenu () { "franz") installFranzMenu ;; + "slack") + installSlackMenu + ;; "Back") break ;; From 26011f61bff934684039c55aa3aec38e12ae8f48 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 09:45:50 +0200 Subject: [PATCH 107/261] eslint added --- repo_functions_ub1604.sh | 1 + repo_functions_ub1804.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index a0e13cf..a98730c 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -392,6 +392,7 @@ typescript;npm;javascript;typescript @angular/cli;npm;javascript;angularcli ionic;npm;javascript;ionic cordova;npm;javascript;cordova +eslint;npm;javascript;eslint oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default php7.0-cli;apt;php;php7.0-cli diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index d8f3ec7..50c4864 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -323,6 +323,7 @@ typescript;npm;javascript;typescript @angular/cli;npm;javascript;angularcli ionic;npm;javascript;ionic cordova;npm;javascript;cordova +eslint;npm;javascript;eslint oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default php7.2-cli;apt;php;php7.2-cli From d4759875185fb3ed4d3f605c7e008878f85bf0b9 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 09:47:47 +0200 Subject: [PATCH 108/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index f4d191c..49fb7b2 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b5" +version="0.5.0-b6" # # myHomedir is used in full paths to the homedir From 14f9eacde0258f5cc92286ddb34b60a2c9b98bda Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 10:26:27 +0200 Subject: [PATCH 109/261] small bug in menu --- menus_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 4063730..1776902 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -331,6 +331,7 @@ function showAppInstallMenu () { "nitrogen" "Nitrogen WP Manager" \ "wine" "Wine Builds" \ "viber" "Viber IM desktop app" \ + "franz" "Franz multi IM app" \ "slack" "Slack App" \ "Back" "Back" 3>&1 1>&2 2>&3) From b6878adcbe1813f94ab0665c80862d1f6caad568 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 11:32:27 +0200 Subject: [PATCH 110/261] small bug fixed --- tools_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools_functions.sh b/tools_functions.sh index 3c93c3a..1956bb5 100644 --- a/tools_functions.sh +++ b/tools_functions.sh @@ -55,7 +55,7 @@ function enableTmpRAM () { function addScreenfetchBashrc () { checkAndInstallDep apt screenfetch screenfetch runCmd "touch /home/$myHomedir/.bashrc" \ - "creating .bashrc file if necessary" \ + "creating .bashrc file if necessary" runCmd "echo 'screenfetch -t' | tee -a /home/$myHomedir/.bashrc" \ "adding screenfetch to .bashrc" } From 7b49566215584be5adbe593ff68f2bb81284f65d Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 12 Jun 2018 13:39:46 +0200 Subject: [PATCH 111/261] big otimization (first step) --- install_functions_ub1604.sh | 800 ------------------------------------ install_functions_ub1804.sh | 736 --------------------------------- menus_functions_ub1604.sh | 110 ++--- menus_functions_ub1804.sh | 102 ++--- yggdrasil.sh | 93 +++-- 5 files changed, 160 insertions(+), 1681 deletions(-) diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh index 493c079..03e8247 100644 --- a/install_functions_ub1604.sh +++ b/install_functions_ub1604.sh @@ -10,76 +10,6 @@ # install functions # #-----------------------------------------------------------------------------# -# -# install Base Apps (headless) -# -function installBase () { - installAppsFromList base -} - -# -# install Base Apps (Menu) -# -function installBaseMenu () { - installAppsFromListMenu base -} - -# -# install Office Apps (headless) -# -function installOffice () { - installAppsFromList office -} - -# -# install Office Apps (Menu) -# -function installOfficeMenu () { - installAppsFromListMenu office -} - -# -# install Multimedia Apps (headless) -# -function installMultimedia () { - installAppsFromList multimedia -} - -# -# install Multimedia Apps (Menu) -# -function installMultimediaMenu () { - installAppsFromListMenu multimedia -} - -# -# install eBook Apps (headless) -# -function installEbook () { - installAppsFromList ebook -} - -# -# install eBook Apps (Menu) -# -function installEbookMenu () { - installAppsFromListMenu ebook -} - -# -# install Internet Apps (headless) -# -function installInternet () { - installAppsFromList internet -} - -# -# install Internet Apps (Menu) -# -function installInternetMenu () { - installAppsFromListMenu internet -} - # # Viber (headless) # @@ -134,272 +64,6 @@ function installSlackMenu () { yes } -# -# install Misc Utilities Apps (headless) -# -function installMiscUtilities () { - installAppsFromList utilities -} - -# -# install Misc Utilities Apps (Menu) -# -function installMiscUtilitiesMenu () { - installAppsFromListMenu utilities -} - -# -# install Wine Build (headless) -# -function installWine () { - installAppsFromList wine -} - -# -# install Wine Build (Menu) -# -function installWineMenu () { - installAppsFromListMenu wine -} - -# -# install Game Apps (headless) -# -function installGames () { - installAppsFromList games -} - -# -# install Game Apps (Menu) -# -function installGamesMenu () { - installAppsFromListMenu games -} - -# -# Steam (headless) -# -function installSteam () { - installAppsFromList steam -} - -# -# Steam (Menu) -# -function installSteamMenu () { - installAppsFromListMenu steam -} - -# -# install Burning Apps (headless) -# -function installBurningTools () { - installAppsFromList burningtools -} - -# -# install Burning Apps (Menu) -# -function installBurningToolsMenu () { - installAppsFromListMenu burningtools -} - -# -# install Network Apps (headless) -# -function installNetTools () { - installAppsFromList nettools -} - -# -# install Network Apps (Menu) -# -function installNetToolsMenu () { - installAppsFromListMenu nettools -} - -# -# install Caja Plugins (headless) -# -function installCajaPlugins () { - installAppsFromList cajaplugins -} - -# -# install Caja Plugins (Menu) -# -function installCajaPluginsMenu () { - installAppsFromListMenu cajaplugins -} - -# -# install Nautilus Apps + plugins (headless) -# -function installNautilusAndPlugins () { - installAppsFromList nautilus -} - -# -# install Nautilus Apps + plugins (Menu) -# -function installNautilusAndPluginsMenu () { - installAppsFromListMenu nautilus -} - -# -# install Thunar + Plugins (headless) -# -function installThunar () { - installAppsFromList thunar -} - -# -# install Thunar + Plugins (Menu) -# -function installThunarMenu () { - installAppsFromListMenu thunar -} - -# -# install Gimp plugins (headless) -# -function installGimpPlugins () { - installAppsFromList gimp -} - -# -# install Gimp plugins (Menu) -# -function installGimpPluginsMenu () { - installAppsFromListMenu gimp -} - -# -# install RhythmBox plugins (headless) -# -function installRhythmBoxPlugins () { - installAppsFromList rhythmbox -} - -# -# install RhythmBox plugins (Menu) -# -function installRhythmBoxPluginsMenu () { - installAppsFromListMenu rhythmbox -} - -# -# install Pidgin plugins (headless) -# -function installPidginPlugins () { - installAppsFromList pidgin -} - -# -# install Pidgin plugins (Menu) -# -function installPidginPluginsMenu () { - installAppsFromListMenu pidgin -} - -# -# install Nitrogen app (headless) -# -function installNitrogen () { - installAppsFromList nitrogen -} - -# -# install Nitrogen app (Menu) -# -function installNitrogenMenu () { - installAppsFromListMenu nitrogen -} - -# -# install Beta Apps (headless) -# -function installBeta () { - installAppsFromList beta -} - -# -# install Beta Apps (Menu) -# -function installBetaMenu () { - installAppsFromListMenu beta -} - -# -# install Nightly Apps (headless) -# -function installNightly () { - installAppsFromList nightly -} - -# -# install Nightly Apps (Menu) -# -function installNightlyMenu () { - installAppsFromListMenu nightly -} - -# -# install GTK Themes (headless) -# -function installThemes () { - installAppsFromList gtkthemes -} - -# -# install GTK Themes (Menu) -# -function installThemesMenu () { - installAppsFromListMenu gtkthemes -} - -# -# install Icon Themes (headless) -# -function installIcons () { - installAppsFromList icons -} - -# -# install Icon Themes (Menu) -# -function installIconsMenu () { - installAppsFromListMenu icons -} - -# -# install Solaar App (headless) -# -function installSolaar () { - installAppsFromList solaar -} - -# -# install Solaar App (Menu) -# -function installSolaarMenu () { - installAppsFromListMenu solaar -} - -# -# install CardReader Apps (headless) -# -function installCardReader () { - installAppsFromList cardreader -} - -# -# install CardReader Apps (Menu) -# -function installCardReaderMenu () { - installAppsFromListMenu cardreader -} - # # update AMD/Intel CPU Microcode # @@ -434,160 +98,6 @@ function fixWirelessIntel6320 () { printf "\n" } -# -# install Webcam Apps (headless) -# -function installWebcam () { - installAppsFromList webcam -} - -# -# install Webcam Apps (Menu) -# -function installWebcamMenu () { - installAppsFromListMenu webcam -} - -# -# install latest versions of graphic drivers, mesa, .... (headless) -# -function installOibaf () { - addRepo_Oibaf -} - -# -# install latest versions of graphic drivers, mesa, .... (Menu) -# -function installOibafMenu () { - addRepo_Oibaf -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia370 () { - installAppsFromList nvidia-370 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia370Menu () { - installAppsFromListMenu nvidia-370 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia375 () { - installAppsFromList nvidia-375 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia375Menu () { - installAppsFromListMenu nvidia-375 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia378 () { - installAppsFromList nvidia-378 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia378Menu () { - installAppsFromListMenu nvidia-378 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia381 () { - installAppsFromList nvidia-381 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia381Menu () { - installAppsFromListMenu nvidia-381 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia384 () { - installAppsFromList nvidia-384 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia384Menu () { - installAppsFromListMenu nvidia-384 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia387 () { - installAppsFromList nvidia-387 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia387Menu () { - installAppsFromListMenu nvidia-387 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia390 () { - installAppsFromList nvidia-390 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia390Menu () { - installAppsFromListMenu nvidia-390 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia396 () { - installAppsFromList nvidia-396 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia396Menu () { - installAppsFromListMenu nvidia-396 -} - -# -# install TLP App (headless) -# -function installTLP () { - installAppsFromList tlp -} - -# -# install TLP App (Menu) -# -function installTLPMenu () { - installAppsFromListMenu tlp -} - # # Key-ID USB Fido U2F device udev rules # @@ -611,310 +121,6 @@ EOF "restarting UDEV service" } -# -# install Dev Apps (headless) -# -function installDevApps () { - installAppsFromList dev -} - -# -# install Dev Apps (Menu) -# -function installDevAppsMenu () { - installAppsFromListMenu dev -} - - -# -# install Javascript env (headless) -# -function installJavascript () { - installAppsFromList javascript -} - -# -# install Javascript env (Menu) -# -function installJavascriptMenu () { - installAppsFromListMenu javascript -} - -# -# install JAVA 10 (headless) -# -function installJava10 () { - installAppsFromList java10 -} - -# -# install JAVA 10 (Menu) -# -function installJava10Menu () { - installAppsFromListMenu java10 -} - -# -# install Mongo DB 3 CE (headless) -# -function installMongo3CE () { - installAppsFromList mongodb -} - -# -# install Mongo DB 3 CE (Menu) -# -function installMongo3CEMenu () { - installAppsFromListMenu mongodb -} - -# -# install Python Apps (headless) -# -function installPython () { - installAppsFromList python -} - -# -# install Python Apps (Menu) -# -function installPythonMenu () { - installAppsFromListMenu python -} - -# -# install PHP Apps (headless) -# -function installPHP () { - installAppsFromList php -} - -# -# install PHP Apps (Menu) -# -function installPHPMenu () { - installAppsFromListMenu php -} - -# -# install QT Apps/tools (headless) -# -function installQT () { - installAppsFromList qt -} - -# -# install QT Apps/tools (Menu) -# -function installQTMenu () { - installAppsFromListMenu qt -} - -# -# install LUA Apps (headless) -# -function installLUA () { - installAppsFromList lua -} - -# -# install LUA Apps (Menu) -# -function installLUAMenu () { - installAppsFromListMenu lua -} - -# -# install Ruby Apps (headless) -# -function installRuby () { - installAppsFromList ruby -} - -# -# install Ruby Apps (Menu) -# -function installRubyMenu () { - installAppsFromListMenu ruby -} - -#TODO: -function installAndroidEnv () { - msg="Installing Android environment" - - runCmd "touch /home/$myHomedir/.bashrc" \ - "creating .bashrc file if necessary" - sh -c "echo '\n\nexport PATH=${PATH}:/home/'$myHomedir'/Android/Sdk/tools:/home/'$myHomedir'/Android/Sdk/platform-tools' >> /home/$myHomedir/.bashrc" -} - -# -# install Atom App (headless) -# -function installAtom () { - installAppsFromList atom -} - -# -# install Atom App (menu) -# -function installAtomMenu () { - installAppsFromListMenu atom -} - -# -# install Anjuta Apps (headless) -# -function installAnjuta () { - installAppsFromList anjuta -} - -# -# install Anjuta Apps (Menu) -# -function installAnjutaMenu () { - installAppsFromListMenu anjuta -} - -# -# install Brackets Apps (headless) -# -function installBrackets () { - installAppsFromList brackets -} - -# -# install Brackets Apps (Menu) -# -function installBracketsMenu () { - installAppsFromListMenu brackets -} - -# -# install CodeBlocks Apps (headless) -# -function installCodeBlocks () { - installAppsFromList codeblocks -} - -# -# install CodeBlocks Apps (Menu) -# -function installCodeBlocksMenu () { - installAppsFromListMenu codeblocks -} - -# -# install Geany Apps (headless) -# -function installGeany () { - installAppsFromList geany -} - -# -# install Geany Apps (Menu) -# -function installGeanyMenu () { - installAppsFromListMenu geany -} - -# -# install IDEA Apps (headless) -# -function installIdea () { - installAppsFromList idea -} - -# -# install IDEA Apps (Menu) -# -function installIdeaMenu () { - installAppsFromListMenu idea -} - -# -# install Eclipse Apps (headless) -# -function installEclipse () { - installAppsFromList eclipse -} - -# -# install Eclipse Apps (Menu) -# -function installEclipseMenu () { - installAppsFromListMenu eclipse -} - -# -# install Pycharm Apps (headless) -# -function installPyCharm () { - installAppsFromList pycharm -} - -# -# install Pycharm Apps (Menu) -# -function installPyCharmMenu () { - installAppsFromListMenu pycharm -} - -# -# install Visual Studio Code Apps (headless) -# -function installVisualStudioCode () { - installAppsFromList code -} - -# -# install Visual Studio Code Apps (Menu) -# -function installVisualStudioCodeMenu () { - installAppsFromListMenu code -} - -# -# install Android-Studio Apps (headless) -# -function installAndroidStudio () { - installAppsFromList androidstudio -} - -# -# install Android-Studio Apps (Menu) -# -function installAndroidStudioMenu () { - installAppsFromListMenu androidstudio -} - -# -# install SublimeText Apps (headless) -# -function installSublimeText() { - installAppsFromList sublime-text -} - -# -# install SublimeText Apps (Menu) -# -function installSublimeTextMenu() { - installAppsFromListMenu sublime-text -} - -# -# install CAD Apps (headless) -# -function installCAD () { - installAppsFromList cad -} - -# -# install CAD Apps (Menu) -# -function installCADMenu () { - installAppsFromListMenu cad -} - # # install Teamviewer 13 (headless) # @@ -969,9 +175,3 @@ function installCompassMenu () { yes } -# -# install/enable Unboud (headless) -# -function installUnbound () { - installAppsFromList unbound -} diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index ca36874..05453fd 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -16,76 +16,6 @@ # install functions # #-----------------------------------------------------------------------------# -# -# install Base Apps (headless) -# -function installBase () { - installAppsFromList base -} - -# -# install Base Apps (Menu) -# -function installBaseMenu () { - installAppsFromListMenu base -} - -# -# install Office Apps (headless) -# -function installOffice () { - installAppsFromList office -} - -# -# install Office Apps (Menu) -# -function installOfficeMenu () { - installAppsFromListMenu office -} - -# -# install Multimedia Apps (headless) -# -function installMultimedia () { - installAppsFromList multimedia -} - -# -# install Multimedia Apps (Menu) -# -function installMultimediaMenu () { - installAppsFromListMenu multimedia -} - -# -# install eBook Apps (headless) -# -function installEbook () { - installAppsFromList ebook -} - -# -# install eBook Apps (Menu) -# -function installEbookMenu () { - installAppsFromListMenu ebook -} - -# -# install Internet Apps (headless) -# -function installInternet () { - installAppsFromList internet -} - -# -# install Internet Apps (Menu) -# -function installInternetMenu () { - installAppsFromListMenu internet -} - # # Viber (headless) # @@ -158,272 +88,6 @@ function installXnViewMPMenu () { yes } -# -# install Misc Utilities Apps (headless) -# -function installMiscUtilities () { - installAppsFromList utilities -} - -# -# install Misc Utilities Apps (Menu) -# -function installMiscUtilitiesMenu () { - installAppsFromListMenu utilities -} - -# -# install Wine Build (headless) -# -function installWine () { - installAppsFromList wine -} - -# -# install Wine Build (Menu) -# -function installWineMenu () { - installAppsFromListMenu wine -} - -# -# install Game Apps (headless) -# -function installGames () { - installAppsFromList games -} - -# -# install Game Apps (Menu) -# -function installGamesMenu () { - installAppsFromListMenu games -} - -# -# Steam (headless) -# -function installSteam () { - installAppsFromList steam -} - -# -# Steam (Menu) -# -function installSteamMenu () { - installAppsFromListMenu steam -} - -# -# install Burning Apps (headless) -# -function installBurningTools () { - installAppsFromList burningtools -} - -# -# install Burning Apps (Menu) -# -function installBurningToolsMenu () { - installAppsFromListMenu burningtools -} - -# -# install Network Apps (headless) -# -function installNetTools () { - installAppsFromList nettools -} - -# -# install Network Apps (Menu) -# -function installNetToolsMenu () { - installAppsFromListMenu nettools -} - -# -# install Caja Plugins (headless) -# -function installCajaPlugins () { - installAppsFromList cajaplugins -} - -# -# install Caja Plugins (Menu) -# -function installCajaPluginsMenu () { - installAppsFromListMenu cajaplugins -} - -# -# install Nautilus Apps + plugins (headless) -# -function installNautilusAndPlugins () { - installAppsFromList nautilus -} - -# -# install Nautilus Apps + plugins (Menu) -# -function installNautilusAndPluginsMenu () { - installAppsFromListMenu nautilus -} - -# -# install Thunar + Plugins (headless) -# -function installThunar () { - installAppsFromList thunar -} - -# -# install Thunar + Plugins (Menu) -# -function installThunarMenu () { - installAppsFromListMenu thunar -} - -# -# install Gimp plugins (headless) -# -function installGimpPlugins () { - installAppsFromList gimp -} - -# -# install Gimp plugins (Menu) -# -function installGimpPluginsMenu () { - installAppsFromListMenu gimp -} - -# -# install RhythmBox plugins (headless) -# -function installRhythmBoxPlugins () { - installAppsFromList rhythmbox -} - -# -# install RhythmBox plugins (Menu) -# -function installRhythmBoxPluginsMenu () { - installAppsFromListMenu rhythmbox -} - -# -# install Pidgin plugins (headless) -# -function installPidginPlugins () { - installAppsFromList pidgin -} - -# -# install Pidgin plugins (Menu) -# -function installPidginPluginsMenu () { - installAppsFromListMenu pidgin -} - -# -# install Nitrogen app (headless) -# -function installNitrogen () { - installAppsFromList nitrogen -} - -# -# install Nitrogen app (Menu) -# -function installNitrogenMenu () { - installAppsFromListMenu nitrogen -} - -# -# install Beta Apps (headless) -# -function installBeta () { - installAppsFromList beta -} - -# -# install Beta Apps (Menu) -# -function installBetaMenu () { - installAppsFromListMenu beta -} - -# -# install Nightly Apps (headless) -# -function installNightly () { - installAppsFromList nightly -} - -# -# install Nightly Apps (Menu) -# -function installNightlyMenu () { - installAppsFromListMenu nightly -} - -# -# install GTK Themes (headless) -# -function installThemes () { - installAppsFromList gtkthemes -} - -# -# install GTK Themes (Menu) -# -function installThemesMenu () { - installAppsFromListMenu gtkthemes -} - -# -# install Icon Themes (headless) -# -function installIcons () { - installAppsFromList icons -} - -# -# install Icon Themes (Menu) -# -function installIconsMenu () { - installAppsFromListMenu icons -} - -# -# install Solaar App (headless) -# -function installSolaar () { - installAppsFromList solaar -} - -# -# install Solaar App (Menu) -# -function installSolaarMenu () { - installAppsFromListMenu solaar -} - -# -# install CardReader Apps (headless) -# -function installCardReader () { - installAppsFromList cardreader -} - -# -# install CardReader Apps (Menu) -# -function installCardReaderMenu () { - installAppsFromListMenu cardreader -} - # # update AMD/Intel CPU Microcode # @@ -458,104 +122,6 @@ function fixWirelessIntel6320 () { printf "\n" } -# -# install Webcam Apps (headless) -# -function installWebcam () { - installAppsFromList webcam -} - -# -# install Webcam Apps (Menu) -# -function installWebcamMenu () { - installAppsFromListMenu webcam -} - -# -# install latest versions of graphic drivers, mesa, .... (headless) -# -function installOibaf () { - addRepo_Oibaf -} - -# -# install latest versions of graphic drivers, mesa, .... (Menu) -# -function installOibafMenu () { - addRepo_Oibaf -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia384 () { - installAppsFromList nvidia-384 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia384Menu () { - installAppsFromListMenu nvidia-384 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia387 () { - installAppsFromList nvidia-387 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia387Menu () { - installAppsFromListMenu nvidia-387 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia390 () { - installAppsFromList nvidia-390 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia390Menu () { - installAppsFromListMenu nvidia-390 -} - -# -# install Nvidia Drivers (headless) -# -function installNvidia396 () { - installAppsFromList nvidia-driver-396 -} - -# -# install Nvidia Drivers (Menu) -# -function installNvidia396Menu () { - installAppsFromListMenu nvidia-driver-396 -} - -# -# install TLP App (headless) -# -function installTLP () { - installAppsFromList tlp -} - -# -# install TLP App (Menu) -# -function installTLPMenu () { - installAppsFromListMenu tlp -} - # # Key-ID USB Fido U2F device udev rules # @@ -579,301 +145,6 @@ EOF "restarting UDEV service" } -# -# install Dev Apps (headless) -# -function installDevApps () { - installAppsFromList dev -} - -# -# install Dev Apps (Menu) -# -function installDevAppsMenu () { - installAppsFromListMenu dev -} - - -# -# install Javascript env (headless) -# -function installJavascript () { - installAppsFromList javascript -} - -# -# install Javascript env (Menu) -# -function installJavascriptMenu () { - installAppsFromListMenu javascript -} - -# -# install JAVA 10 (headless) -# -function installJava10 () { - installAppsFromList java10 -} - -# -# install JAVA 10 (Menu) -# -function installJava10Menu () { - installAppsFromListMenu java10 -} - -# -# install Mongo DB 3 CE (headless) -# -function installMongo3CE () { - installAppsFromList mongodb -} - -# -# install Mongo DB 3 CE (Menu) -# -function installMongo3CEMenu () { - installAppsFromListMenu mongodb -} - -# -# install Python Apps (headless) -# -function installPython () { - installAppsFromList python -} - -# -# install Python Apps (Menu) -# -function installPythonMenu () { - installAppsFromListMenu python -} - -# -# install PHP Apps (headless) -# -function installPHP () { - installAppsFromList php -} - -# -# install PHP Apps (Menu) -# -function installPHPMenu () { - installAppsFromListMenu php -} - -# -# install QT Apps/tools (headless) -# -function installQT () { - installAppsFromList qt -} - -# -# install QT Apps/tools (Menu) -# -function installQTMenu () { - installAppsFromListMenu qt -} - -# -# install LUA Apps (headless) -# -function installLUA () { - installAppsFromList lua -} - -# -# install LUA Apps (Menu) -# -function installLUAMenu () { - installAppsFromListMenu lua -} - -# -# install Ruby Apps (headless) -# -function installRuby () { - installAppsFromList ruby -} - -# -# install Ruby Apps (Menu) -# -function installRubyMenu () { - installAppsFromListMenu ruby -} - -# -# install Atom App (headless) -# -function installAtom () { - installAppsFromList atom -} - -# -# install Atom App (menu) -# -function installAtomMenu () { - installAppsFromListMenu atom -} - -# -# install Anjuta Apps (headless) -# -function installAnjuta () { - installAppsFromList anjuta -} - -# -# install Anjuta Apps (Menu) -# -function installAnjutaMenu () { - installAppsFromListMenu anjuta -} - -# -# install Brackets Apps (headless) -# -function installBrackets () { - installAppsFromList brackets -} - -# -# install Brackets Apps (Menu) -# -function installBracketsMenu () { - installAppsFromListMenu brackets -} - -# -# install CodeBlocks Apps (headless) -# -function installCodeBlocks () { - installAppsFromList codeblocks -} - -# -# install CodeBlocks Apps (Menu) -# -function installCodeBlocksMenu () { - installAppsFromListMenu codeblocks -} - -# -# install Geany Apps (headless) -# -function installGeany () { - installAppsFromList geany -} - -# -# install Geany Apps (Menu) -# -function installGeanyMenu () { - installAppsFromListMenu geany -} - -# -# install IDEA Apps (headless) -# -function installIdea () { - installAppsFromList idea -} - -# -# install IDEA Apps (Menu) -# -function installIdeaMenu () { - installAppsFromListMenu idea -} - -# -# install Eclipse Apps (headless) -# -function installEclipse () { - installAppsFromList eclipse -} - -# -# install Eclipse Apps (Menu) -# -function installEclipseMenu () { - installAppsFromListMenu eclipse -} - -# -# install Pycharm Apps (headless) -# -function installPyCharm () { - installAppsFromList pycharm -} - -# -# install Pycharm Apps (Menu) -# -function installPyCharmMenu () { - installAppsFromListMenu pycharm -} - -# -# install Visual Studio Code Apps (headless) -# -function installVisualStudioCode () { - installAppsFromList code -} - -# -# install Visual Studio Code Apps (Menu) -# -function installVisualStudioCodeMenu () { - installAppsFromListMenu code -} - -# -# install Android-Studio Apps (headless) -# -function installAndroidStudio () { - installAppsFromList androidstudio -} - -# -# install Android-Studio Apps (Menu) -# -function installAndroidStudioMenu () { - installAppsFromListMenu androidstudio -} - -# -# install SublimeText Apps (headless) -# -function installSublimeText() { - installAppsFromList sublime-text -} - -# -# install SublimeText Apps (Menu) -# -function installSublimeTextMenu() { - installAppsFromListMenu sublime-text -} - -# -# install CAD Apps (headless) -# -function installCAD () { - installAppsFromList cad -} - -# -# install CAD Apps (Menu) -# -function installCADMenu () { - installAppsFromListMenu cad -} - # # install Teamviewer 13 (headless) # @@ -927,10 +198,3 @@ function installBoostnotesMenu () { boostnotes.deb \ yes } - -# -# install/enable Unboud (headless) -# -function installUnbound () { - installAppsFromList unbound -} diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh index 731ae05..c96bd0a 100644 --- a/menus_functions_ub1604.sh +++ b/menus_functions_ub1604.sh @@ -98,7 +98,7 @@ function showConfigMenu () { ;; "Unbound") clear - installUnbound + installAppsFromList unbound pressKey ;; "Back") @@ -174,10 +174,10 @@ function showThemesInstallMenu () { case $themesInstallMenuOptions in "themes") - installThemesMenu + installAppsFromListMenu gtkthemes ;; "icons") - installIconsMenu + installAppsFromListMenu icons ;; "Back") break @@ -225,67 +225,67 @@ function showDevInstallMenu () { case $devInstallMenuOptions in "devbase") - installDevAppsMenu + installAppsFromListMenu dev ;; "java10") - installJava10 + installAppsFromListMenu java10 ;; "javascript") - installJavascriptMenu + installAppsFromListMenu javascript ;; "mongodb3ce") - installMongo3CEMenu + installAppsFromListMenu mongodb ;; "php") - installPHPMenu + installAppsFromListMenu php ;; "lua") - installLUAMenu + installAppsFromListMenu lua ;; "ruby") - installRubyMenu + installAppsFromListMenu ruby ;; "qt") - installQTMenu + installAppsFromListMenu qt ;; "python") - installPythonMenu + installAppsFromListMenu python ;; "atom") - installAtomMenu + installAppsFromListMenu atom ;; "anjuta") - installAnjutaMenu + installAppsFromListMenu anjuta ;; "brackets") - installBracketsMenu + installAppsFromListMenu brackets ;; "codeblocks") - installCodeBlocksMenu + installAppsFromListMenu codeblocks ;; "geany") - installGeanyMenu + installAppsFromListMenu geany ;; "idea") - installIdeaMenu + installAppsFromListMenu idea ;; "eclipse") - installEclipseMenu + installAppsFromListMenu eclipse ;; "pycharm") - installPyCharmMenu + installAppsFromListMenu pycharm ;; "vsc") - installVisualStudioCodeMenu + installAppsFromListMenu code ;; "androidstudio") - installAndroidStudioMenu + installAppsFromListMenu androidstudio ;; "sublimetext") - installSublimeTextMenu + installAppsFromListMenu sublime-text ;; "cad") - installCADMenu + installAppsFromListMenu cad ;; "teamviewer13") installTeamViewer13Menu @@ -317,9 +317,11 @@ function showAppInstallMenu () { "base" "Base Apps" \ "office" "Office Apps" \ "multimedia" "Multimedia Apps" \ + "ebook" "eBook Apps" \ "internet" "Internet Apps" \ "utilities" "Misc Utilities" \ "games" "Games & tools" \ + "steam" "Steam" \ "burningtools" "Disc Burning and tools" \ "nettools" "Network tools" \ "cajaplugins" "Caja Plugins" \ @@ -337,52 +339,58 @@ function showAppInstallMenu () { case $appsInstallMenuOptions in "base") - installBaseMenu + installAppsFromListMenu base ;; "office") - installOfficeMenu + installAppsFromListMenu office ;; "multimedia") - installMultimediaMenu + installAppsFromListMenu multimedia + ;; + "ebook") + installAppsFromListMenu ebook ;; "internet") - installInternetMenu + installAppsFromListMenu internet ;; "utilities") - installMiscUtilitiesMenu + installAppsFromListMenu utilities ;; "games") - installGamesMenu + installAppsFromListMenu games + ;; + "steam") + installAppsFromListMenu steam ;; "burningtools") - installBurningToolsMenu + installAppsFromListMenu burningtools ;; "nettools") - installNetToolsMenu + installAppsFromListMenu nettools ;; "cajaplugins") - installCajaPluginsMenu + installAppsFromListMenu cajaplugins ;; "nautilus") installNautilusAndPluginsMenu ;; "thunar") - installThunarMenu + installAppsFromListMenu thunar ;; "gimp") - installGimpPluginsMenu + installAppsFromListMenu gimp ;; "rhythmbox") - installRhythmBoxPluginsMenu + installAppsFromListMenu rhythmbox ;; "pidgin") - installPidginPluginsMenu + installAppsFromListMenu pidgin ;; "nitrogen") - installNitrogenMenu + installAppsFromListMenu nitrogen ;; "wine") - installWineMenu + installAppsFromListMenu wine ;; "viber") installViberMenu @@ -444,43 +452,43 @@ function showHardwareMenu () { case $hardwareMenuOptions in "cardreader") - installCardReaderMenu + installAppsFromListMenu cardreader ;; "solaar") - installAppsFromListMenu + installAppsFromListMenu solaar ;; "webcam") - installWebcamMenu + installAppsFromListMenu webcam ;; "microcode") updateMicrocode ;; "nvidia370") - installNvidia370Menu + installAppsFromListMenu nvidia-370 ;; "nvidia375") - installNvidia375Menu + installAppsFromListMenu nvidia-375 ;; "nvidia378") - installNvidia378Menu + installAppsFromListMenu nvidia-378 ;; "nvidia381") - installNvidia381Menu + installAppsFromListMenu nvidia-381 ;; "nvidia384") - installNvidia384Menu + installAppsFromListMenu nvidia-384 ;; "nvidia387") - installNvidia387Menu + installAppsFromListMenu nvidia-387 ;; "nvidia390") - installNvidia390Menu + installAppsFromListMenu nvidia-390 ;; "nvidia396") - installNvidia396Menu + installAppsFromListMenu nvidia-396 ;; "tlp") - installTLPMenu + installAppsFromListMenu tlp ;; "keyid") installKeyIDuDev diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 1776902..0f7d63f 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -98,7 +98,7 @@ function showConfigMenu () { ;; "Unbound") clear - installUnbound + installAppsFromList unbound pressKey ;; "Back") @@ -174,10 +174,10 @@ function showThemesInstallMenu () { case $themesInstallMenuOptions in "themes") - installThemesMenu + installAppsFromListMenu gtkthemes ;; "icons") - installIconsMenu + installAppsFromListMenu icons ;; "Back") break @@ -225,67 +225,67 @@ function showDevInstallMenu () { case $devInstallMenuOptions in "devbase") - installDevAppsMenu + installAppsFromListMenu dev ;; "java10") - installJava10 + installAppsFromListMenu java10 ;; "javascript") - installJavascriptMenu + installAppsFromListMenu javascript ;; "mongodb3ce") - installMongo3CEMenu + installAppsFromListMenu mongodb ;; "php") - installPHPMenu + installAppsFromListMenu php ;; "lua") - installLUAMenu + installAppsFromListMenu lua ;; "ruby") - installRubyMenu + installAppsFromListMenu ruby ;; "qt") - installQTMenu + installAppsFromListMenu qt ;; "python") - installPythonMenu + installAppsFromListMenu python ;; "atom") - installAtomMenu + installAppsFromListMenu atom ;; "anjuta") - installAnjutaMenu + installAppsFromListMenu anjuta ;; "brackets") - installBracketsMenu + installAppsFromListMenu brackets ;; "codeblocks") - installCodeBlocksMenu + installAppsFromListMenu codeblocks ;; "geany") - installGeanyMenu + installAppsFromListMenu geany ;; "idea") - installIdeaMenu + installAppsFromListMenu idea ;; "eclipse") - installEclipseMenu + installAppsFromListMenu eclipse ;; "pycharm") - installPyCharmMenu + installAppsFromListMenu pycharm ;; "vsc") - installVisualStudioCodeMenu + installAppsFromListMenu code ;; "androidstudio") - installAndroidStudioMenu + installAppsFromListMenu androidstudio ;; "sublimetext") - installSublimeTextMenu + installAppsFromListMenu sublime-text ;; "cad") - installCADMenu + installAppsFromListMenu cad ;; "teamviewer13") installTeamViewer13Menu @@ -317,9 +317,11 @@ function showAppInstallMenu () { "base" "Base Apps" \ "office" "Office Apps" \ "multimedia" "Multimedia Apps" \ + "ebook" "eBook Apps" \ "internet" "Internet Apps" \ "utilities" "Misc Utilities" \ "games" "Games & tools" \ + "steam" "Steam" \ "burningtools" "Disc Burning and tools" \ "nettools" "Network tools" \ "cajaplugins" "Caja Plugins" \ @@ -337,52 +339,58 @@ function showAppInstallMenu () { case $appsInstallMenuOptions in "base") - installBaseMenu + installAppsFromListMenu base ;; "office") - installOfficeMenu + installAppsFromListMenu office ;; "multimedia") - installMultimediaMenu + installAppsFromListMenu multimedia + ;; + "ebook") + installAppsFromListMenu ebook ;; "internet") - installInternetMenu + installAppsFromListMenu internet ;; "utilities") - installMiscUtilitiesMenu + installAppsFromListMenu utilities ;; "games") - installGamesMenu + installAppsFromListMenu games + ;; + "steam") + installAppsFromListMenu steam ;; "burningtools") - installBurningToolsMenu + installAppsFromListMenu burningtools ;; "nettools") - installNetToolsMenu + installAppsFromListMenu nettools ;; "cajaplugins") - installCajaPluginsMenu + installAppsFromListMenu cajaplugins ;; "nautilus") installNautilusAndPluginsMenu ;; "thunar") - installThunarMenu + installAppsFromListMenu thunar ;; "gimp") - installGimpPluginsMenu + installAppsFromListMenu gimp ;; "rhythmbox") - installRhythmBoxPluginsMenu + installAppsFromListMenu rhythmbox ;; "pidgin") - installPidginPluginsMenu + installAppsFromListMenu pidgin ;; "nitrogen") - installNitrogenMenu + installAppsFromListMenu nitrogen ;; "wine") - installWineMenu + installAppsFromListMenu wine ;; "viber") installViberMenu @@ -440,31 +448,31 @@ function showHardwareMenu () { case $hardwareMenuOptions in "cardreader") - installCardReaderMenu + installAppsFromListMenu cardreader ;; "solaar") - installAppsFromListMenu + installAppsFromListMenu solaar ;; "webcam") - installWebcamMenu + installAppsFromListMenu webcam ;; "microcode") updateMicrocode ;; "nvidia384") - installNvidia384Menu + installAppsFromListMenu nvidia-384 ;; "nvidia387") - installNvidia387Menu + installAppsFromListMenu nvidia-387 ;; "nvidia390") - installNvidia390Menu + installAppsFromListMenu nvidia-390 ;; "nvidia396") - installNvidia396Menu + installAppsFromListMenu nvidia-driver-396 ;; "tlp") - installTLPMenu + installAppsFromListMenu tlp ;; "keyid") installKeyIDuDev diff --git a/yggdrasil.sh b/yggdrasil.sh index 1552aff..d6764db 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -71,26 +71,26 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do ygginitCount=true fi msg "Installing Apps" - installBase - installOffice + installAppsFromList base + installAppsFromList office installBurningTools - installEbook - installGames - installSteam - installInternet + installAppsFromList ebook + installAppsFromList games + installAppsFromList steam + installAppsFromList internet installJava10 - installMiscUtilities - installMultimedia - installNetTools - installWine - installCajaPlugins - installNautilusAndPlugins - installThunar - installGimpPlugins - installPidginPlugins - installRhythmBoxPlugins + installAppsFromList utilities + installAppsFromList multimedia + installAppsFromList nettools + installAppsFromList wine + installAppsFromList cajaplugins + installAppsFromList nautilus + installAppsFromList thunar + installAppsFromList gimp + installAppsFromList pidgin + installAppsFromList rhythmbox msg "Installing HW related" - installWebcam + installAppsFromList webcam updateMicrocode msg "Applying system customizations" enableUFW @@ -114,28 +114,28 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do ygginitCount=true fi msg "Installing Apps" - installBase - installOffice + installAppsFromList base + installAppsFromList office installBurningTools - installEbook - installGames - installSteam - installInternet + installAppsFromList ebook + installAppsFromList games + installAppsFromList steam + installAppsFromList internet installJava10 - installMiscUtilities - installMultimedia - installNetTools - installWine - installCajaPlugins - installNautilusAndPlugins - installThunar - installGimpPlugins - installPidginPlugins - installRhythmBoxPlugins + installAppsFromList utilities + installAppsFromList multimedia + installAppsFromList nettools + installAppsFromList wine + installAppsFromList cajaplugins + installAppsFromList nautilus + installAppsFromList thunar + installAppsFromList gimp + installAppsFromList pidgin + installAppsFromList rhythmbox msg "Installing HW related" - installWebcam + installAppsFromList webcam updateMicrocode - installCardReader + installAppsFromList cardreader msg "Applying system customizations" enableUFW enableNumLockX @@ -144,8 +144,8 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do installUnattendedUpgrades enableUnbound msg "Installing additional themes/icons" - installIcons - installThemes + installAppsFromList icons + installAppsFromList gtkthemes msg "Installing external apps" installViber installFranz @@ -162,8 +162,8 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do ygginitCount=true fi msg "Installing Icons/Themes" - installIcons - installThemes + installAppsFromList icons + installAppsFromList gtkthemes ;; w) # nitrogen if [ $ygginitCount = false ]; then @@ -174,7 +174,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do ygginitCount=true fi msg "Installing Nitrogen" - installNitrogen + installAppsFromList nitrogen ;; d) # install Unbound DNS Cache if [ $ygginitCount = false ]; then @@ -196,7 +196,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do ygginitCount=true fi msg "Installing Card Readers Apps" - installCardReader + installAppsFromList cardreader ;; s) # solaar for logitech devices if [ $ygginitCount = false ]; then @@ -207,7 +207,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do ygginitCount=true fi msg "Installing Solaar" - installSolaar + installAppsFromList solaar ;; t) # tlp (laptop or low energy usage) if [ $ygginitCount = false ]; then @@ -218,7 +218,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do ygginitCount=true fi msg "Installing TLP" - installTLP + installAppsFromList tlp ;; n) # latest nvidia driver (see menus if need older version) if [ $ygginitCount = false ]; then @@ -228,8 +228,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do updateSystem ygginitCount=true fi - msg "Installing Nvidia Latest Driver" - installNvidia396 + installAppsFromList nvidia-driver-396 ;; k) if [ $ygginitCount = false ]; then @@ -330,10 +329,10 @@ case $mainMenuOptions in showAppInstallMenu ;; "3") - showAppBetaInstallMenu + installAppsFromListMenu beta ;; "4") - showAppNightlyInstallMenu + installAppsFromListMenu nightly ;; "5") showThemesInstallMenu From 096d1be3b6f0c5928fec554b11823798aadd57d6 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 13 Jun 2018 05:13:39 +0200 Subject: [PATCH 112/261] small fix --- yggdrasil.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/yggdrasil.sh b/yggdrasil.sh index d6764db..f5a6242 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -185,7 +185,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do ygginitCount=true fi msg "Installing Unbound" - installUnbound + installAppsFromList unbound ;; q) # cardreader if [ $ygginitCount = false ]; then From 3b4e277927fbb6493037cdcf99f9c6b42f865332 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 13 Jun 2018 08:56:20 +0200 Subject: [PATCH 113/261] Iridium-Browser added by repo --- repo_functions_ub1604.sh | 14 +++++++++++++- repo_functions_ub1804.sh | 14 +++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index a98730c..e0dfbd7 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -137,6 +137,7 @@ deluge-gtk;apt;internet;deluge-gtk deluge-torrent;apt;internet;deluge-torrent vivaldi-stable;apt;internet;vivaldi-stable transmission-gtk;apt;internet;transmission-gtk +iridium-browser;apt;internet;iridiumbrowser qtqr;apt;utilities;qtqr gqrcode;apt;utilities;gqrcode cpu-g;apt;utilities;cpu-g @@ -623,7 +624,18 @@ syncthing-gtk;addRepo_Webupd8 telegram-purple;addRepo_Webupd8 screenkey;addRepo_Webupd8 yad;addRepo_Webupd8 -woeusb;addRepo_Webupd8" +woeusb;addRepo_Webupd8 +iridiumbrowser;addRepo_Iridium" + +# +# Iridium-Browser +# +function addRepo_Iridium () { + addKey "https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub" + addRepo iridium-browser.list \ + "deb [arch=amd64] https://downloads.iridiumbrowser.de/deb/ stable main" \ + "deb-src https://downloads.iridiumbrowser.de/deb/ stable main" +} # # Audacious, Guake diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 50c4864..e2779c6 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -125,6 +125,7 @@ deluge-gtk;apt;internet;deluge-gtk deluge-torrent;apt;internet;deluge-torrent vivaldi-stable;apt;internet;vivaldi-stable transmission-gtk;apt;internet;transmission-gtk +iridium-browser;apt;internet;iridiumbrowser qtqr;apt;utilities;qtqr cpu-g;apt;utilities;cpu-g screenfetch;apt;utilities;screenfetch @@ -507,7 +508,18 @@ qt5ct;addRepo_Webupd8 screenkey;addRepo_Webupd8 yad;addRepo_Webupd8 woeusb;addRepo_Webupd8 -cpu-g;addRepo_Atareao" +cpu-g;addRepo_Atareao +iridiumbrowser;addRepo_Iridium" + +# +# Iridium-Browser +# +function addRepo_Iridium () { + addKey "https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub" + addRepo iridium-browser.list \ + "deb [arch=amd64] https://downloads.iridiumbrowser.de/deb/ stable main" \ + "deb-src https://downloads.iridiumbrowser.de/deb/ stable main" +} # # Atareao ppa From 1868392053558401373dfa5e44f4203f02c6fbae Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 13 Jun 2018 11:23:46 +0200 Subject: [PATCH 114/261] update ruby's gems in updateSystem fct added --- core_functions.sh | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/core_functions.sh b/core_functions.sh index ef153f4..3a4e5d6 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -259,6 +259,20 @@ function updateSystem () { retCode $ret_code fi + if which gem >/dev/null; then + printf "[GEM] updating --system " + printf "\n[GEM] updating --system\n" &>> $logFile + sudo gem update --system &>> $logFile + ret_code=$? + retCode $ret_code + + printf "[GEM] updating gems " + printf "\n[GEM] updating gems\n" &>> $logFile + sudo gem update &>> $logFile + ret_code=$? + retCode $ret_code + fi + repoAdded=0 } From 25f516fc8971e716c62c4f4b33312abad78e1ab7 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 13 Jun 2018 12:06:43 +0200 Subject: [PATCH 115/261] npm update added to updateSystem fct --- core_functions.sh | 25 ++++++++++++++++++------- 1 file changed, 18 insertions(+), 7 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 3a4e5d6..713640a 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -228,6 +228,7 @@ function kernelUpdate () { # # system update +# input : normal/full #TODO: add pip, npm (yarn?), gem # function updateSystem () { @@ -259,18 +260,28 @@ function updateSystem () { retCode $ret_code fi + if which npm >/dev/null; then + printf "[NPM] update npm " + printf "\n[NPM] update npm\n" &>> $logFile + sudo npm i -g npm &>> $logFile + ret_code=$? + retCode $ret_code + fi + if which gem >/dev/null; then - printf "[GEM] updating --system " - printf "\n[GEM] updating --system\n" &>> $logFile + printf "[GEM] update --system " + printf "\n[GEM] update --system\n" &>> $logFile sudo gem update --system &>> $logFile ret_code=$? retCode $ret_code - printf "[GEM] updating gems " - printf "\n[GEM] updating gems\n" &>> $logFile - sudo gem update &>> $logFile - ret_code=$? - retCode $ret_code + if [ "$1" == "full" ]; then + printf "[GEM] update gems " + printf "\n[GEM] update gems\n" &>> $logFile + sudo gem update &>> $logFile + ret_code=$? + retCode $ret_code + fi fi repoAdded=0 From 8f3b0f3f22deb1238eca264f074896a3a5aece25 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 13 Jun 2018 12:18:19 +0200 Subject: [PATCH 116/261] npm/gem upd moved to yggInit --- core_functions.sh | 35 ++++++++++------------------------- vars.sh | 2 +- 2 files changed, 11 insertions(+), 26 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 713640a..1eafea0 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -170,6 +170,11 @@ function yggInit () { installPackage apt "ruby-dev" else printf "[INIT][GEM] found [ "$BOLDVERT"OK"$NORMAL" ] \n" + printf "[GEM] update --system " + printf "\n[GEM] update --system\n" &>> $logFile + sudo gem update --system &>> $logFile + ret_code=$? + retCode $ret_code fi # SNAP @@ -188,6 +193,11 @@ function yggInit () { installPackage apt "nodejs" else printf "[INIT][NPM] found [ "$BOLDVERT"OK"$NORMAL" ] \n" + printf "[NPM] update npm " + printf "\n[NPM] update npm\n" &>> $logFile + sudo npm i -g npm &>> $logFile + ret_code=$? + retCode $ret_code fi # PIP3 @@ -228,7 +238,6 @@ function kernelUpdate () { # # system update -# input : normal/full #TODO: add pip, npm (yarn?), gem # function updateSystem () { @@ -260,30 +269,6 @@ function updateSystem () { retCode $ret_code fi - if which npm >/dev/null; then - printf "[NPM] update npm " - printf "\n[NPM] update npm\n" &>> $logFile - sudo npm i -g npm &>> $logFile - ret_code=$? - retCode $ret_code - fi - - if which gem >/dev/null; then - printf "[GEM] update --system " - printf "\n[GEM] update --system\n" &>> $logFile - sudo gem update --system &>> $logFile - ret_code=$? - retCode $ret_code - - if [ "$1" == "full" ]; then - printf "[GEM] update gems " - printf "\n[GEM] update gems\n" &>> $logFile - sudo gem update &>> $logFile - ret_code=$? - retCode $ret_code - fi - fi - repoAdded=0 } diff --git a/vars.sh b/vars.sh index 49fb7b2..7400788 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b6" +version="0.5.0-b7" # # myHomedir is used in full paths to the homedir From da7d3e6be7472af30491ced00ffc2392656c88c6 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 6 Jul 2018 10:47:24 +0200 Subject: [PATCH 117/261] jq cli tool added --- repo_functions_ub1604.sh | 1 + repo_functions_ub1804.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index e0dfbd7..2f1f571 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -384,6 +384,7 @@ beautysh;pip;dev;beautysh mycli;pip;dev;mycli sqlitebrowser;apt;dev;sqlitebrowser mysql-workbench;apt;dev;mysql-workbench +jq;apt;dev;jq nodejs;apt;javascript;nodejs8lts javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index e2779c6..8c0b549 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -315,6 +315,7 @@ beautysh;pip;dev;beautysh mycli;pip;dev;mycli sqlitebrowser;apt;dev;sqlitebrowser mysql-workbench;apt;dev;mysql-workbench +jq;apt;dev;jq nodejs;apt;javascript;nodejs8lts javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn From 30423b07bf5ce99da619956adeae9dbdd0823d8f Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 6 Jul 2018 10:53:54 +0200 Subject: [PATCH 118/261] web-ext added by npm --- repo_functions_ub1604.sh | 1 + repo_functions_ub1804.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 2f1f571..69010ab 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -395,6 +395,7 @@ typescript;npm;javascript;typescript ionic;npm;javascript;ionic cordova;npm;javascript;cordova eslint;npm;javascript;eslint +web-ext;npm;javascript;web-ext oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default php7.0-cli;apt;php;php7.0-cli diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 8c0b549..8046a5f 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -326,6 +326,7 @@ typescript;npm;javascript;typescript ionic;npm;javascript;ionic cordova;npm;javascript;cordova eslint;npm;javascript;eslint +web-ext;npm;javascript;web-ext oracle-java10-installer;apt;java10;oracle-java10-installer oracle-java10-set-default;apt;java10;oracle-java10-set-default php7.2-cli;apt;php;php7.2-cli From b32692aaa27b75defdaadb8caf36617613955bb0 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Mon, 9 Jul 2018 08:59:29 +0200 Subject: [PATCH 119/261] . --- repo_functions_ub1604.sh | 2 +- repo_functions_ub1804.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 69010ab..d37f8b6 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -1340,7 +1340,7 @@ EOF # # Plank themes -#TODO: test it +# function plank_PostTrtFct () { typeset ret_code diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 8046a5f..0485cff 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1155,7 +1155,7 @@ EOF # # Plank themes -#TODO: test it +# function plank_PostTrtFct () { typeset ret_code From 9576d58a51f33afa4153eed533f12619f870716c Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Mon, 9 Jul 2018 09:09:36 +0200 Subject: [PATCH 120/261] . --- core_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core_functions.sh b/core_functions.sh index 1eafea0..e5e4b0d 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -366,7 +366,7 @@ function installPackageDpkg () { # install package from repositories # input : package manager, package name # package manager available : apt, pip, npm, gem, snap -# TODO: add apm, flatpak, umake?, use yarn instead of npm ? +# TODO: add apm, code, flatpak, umake?, use yarn instead of npm ? # function installPackage () { typeset pkg="$2" From 56cb8ac0c8d7d0c3f4b0dfcef8a1380e1c8e6864 Mon Sep 17 00:00:00 2001 From: "Francois B (Makoto)" Date: Thu, 19 Jul 2018 01:04:36 +0200 Subject: [PATCH 121/261] set yarn by default for angular cli is upd to new syntax --- repo_functions_ub1604.sh | 2 +- repo_functions_ub1804.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index d37f8b6..55c8279 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -1266,7 +1266,7 @@ angularcli;angularcli_PostTrtFct" # function angularcli_PostTrtFct () { if which yarn >/dev/null; then - runCmd "ng set --global packageManager=yarn" + runCmd "ng config -g cli.packageManager yarn" "using yarn instead of nom for angular/cli" fi } diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 0485cff..ff6398a 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1082,7 +1082,7 @@ function dockerio_PostTrtFct () { # function angularcli_PostTrtFct () { if which yarn >/dev/null; then - runCmd "ng set --global packageManager=yarn" \ + runCmd "ng config -g cli.packageManager yarn" \ "using yarn instead of nom for angular/cli" fi } From b1543c004f2fceda5f277fd532956d745155fd30 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 20 Jul 2018 14:39:48 +0200 Subject: [PATCH 122/261] newer version of picard by ppa --- repo_functions_ub1604.sh | 10 +++++++++- repo_functions_ub1804.sh | 10 +++++++++- 2 files changed, 18 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 55c8279..a6ba5eb 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -627,7 +627,15 @@ telegram-purple;addRepo_Webupd8 screenkey;addRepo_Webupd8 yad;addRepo_Webupd8 woeusb;addRepo_Webupd8 -iridiumbrowser;addRepo_Iridium" +iridiumbrowser;addRepo_Iridium +picard;addRepo_Picard" + +# +# MusicBrainz Picard +# +function addRepo_Picard () { + addPPA ppa:musicbrainz-developers/stable +} # # Iridium-Browser diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index ff6398a..f377d4b 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -511,7 +511,15 @@ screenkey;addRepo_Webupd8 yad;addRepo_Webupd8 woeusb;addRepo_Webupd8 cpu-g;addRepo_Atareao -iridiumbrowser;addRepo_Iridium" +iridiumbrowser;addRepo_Iridium +picard;addRepo_Picard" + +# +# MusicBrainz Picard +# +function addRepo_Picard () { + addPPA ppa:musicbrainz-developers/stable +} # # Iridium-Browser From bc1cd103af5fed299fe579d441baf39760ffafbe Mon Sep 17 00:00:00 2001 From: "Francois B (Makoto)" Date: Sat, 4 Aug 2018 06:44:27 +0200 Subject: [PATCH 123/261] some bugs fixed + owncloud removed --- repo_functions_ub1604.sh | 11 ----------- repo_functions_ub1804.sh | 11 ----------- yggdrasil.sh | 10 +++++----- 3 files changed, 5 insertions(+), 27 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index a6ba5eb..4f9fb1b 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -109,7 +109,6 @@ python-musicbrainz2;apt;multimedia;python-musicbrainz2 gmusicbrowser;apt;multimedia;gmusicbrowser peek;apt;multimedia;peek bino;apt;multimedia;bino -owncloud-client;apt;internet;owncloud-client syncthing-gtk;apt;internet;syncthing-gtk syncthing;apt;internet;syncthing insync;apt;internet;insync @@ -470,7 +469,6 @@ etcher-electron;addRepo_Etcher sublime-text;addRepo_SublimeText vivaldi-stable;addRepo_Vivaldi virtualbox-5.2;addRepo_VirtualBox -owncloud-client;addRepo_OwnCloud syncthing;addRepo_Syncthing opera-stable;addRepo_Opera insync;addRepo_Insync @@ -1075,15 +1073,6 @@ function addRepo_Syncthing () { "deb http://apt.syncthing.net/ syncthing release" } -# -# OwnCloud -# -function addRepo_OwnCloud () { - addKey "http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_16.04/Release.key" - addRepo owncloud-client.list \ - "deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_16.04/ /" -} - # # VirtualBox # diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index f377d4b..ae20d3f 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -103,7 +103,6 @@ python-musicbrainz2;apt;multimedia;python-musicbrainz2 gmusicbrowser;apt;multimedia;gmusicbrowser peek;apt;multimedia;peek bino;apt;multimedia;bino -owncloud-client;apt;internet;owncloud-client syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync @@ -399,7 +398,6 @@ etcher-electron;addRepo_Etcher sublime-text;addRepo_SublimeText vivaldi-stable;addRepo_Vivaldi virtualbox-5.2;addRepo_VirtualBox -owncloud-client;addRepo_OwnCloud syncthing;addRepo_Syncthing syncthinggtk;addRepo_SyncthingGtk opera-stable;addRepo_Opera @@ -890,15 +888,6 @@ function addRepo_Syncthing () { "deb http://apt.syncthing.net/ syncthing release" } -# -# OwnCloud -# -function addRepo_OwnCloud () { - addKey "http://download.opensuse.org/repositories/isv:ownCloud:desktop/Ubuntu_16.04/Release.key" - addRepo owncloud-client.list \ - "deb http://download.opensuse.org/repositories/isv:/ownCloud:/desktop/Ubuntu_16.04/ /" -} - # # VirtualBox # diff --git a/yggdrasil.sh b/yggdrasil.sh index f5a6242..76d1e5c 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -73,12 +73,12 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do msg "Installing Apps" installAppsFromList base installAppsFromList office - installBurningTools + installAppsFromList burningtools installAppsFromList ebook installAppsFromList games installAppsFromList steam installAppsFromList internet - installJava10 + installAppsFromList java10 installAppsFromList utilities installAppsFromList multimedia installAppsFromList nettools @@ -116,12 +116,12 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do msg "Installing Apps" installAppsFromList base installAppsFromList office - installBurningTools + installAppsFromList burningtools installAppsFromList ebook installAppsFromList games installAppsFromList steam installAppsFromList internet - installJava10 + installAppsFromList java10 installAppsFromList utilities installAppsFromList multimedia installAppsFromList nettools @@ -142,7 +142,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do addScreenfetchBashrc enableHistoryTS installUnattendedUpgrades - enableUnbound + installAppsFromList unbound msg "Installing additional themes/icons" installAppsFromList icons installAppsFromList gtkthemes From 4f03efbf69b53759927c659260f55b912e66a8ab Mon Sep 17 00:00:00 2001 From: "Francois B (Makoto)" Date: Sun, 5 Aug 2018 02:21:13 +0200 Subject: [PATCH 124/261] docky added and readme updated --- README.md | 10 +++++++--- repo_functions_ub1804.sh | 1 + 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index bfd1a35..1c1de8e 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,13 @@ About ----- -!! Warnings : this is a early beta version !! +__!! Warnings : this is a early beta version !!__ -The purpose of this script is to provide a full set of tools to install, customize and tweak a fresh installation of Linux Mint 18.x/19.x, Ubuntu 16.04/18.04 and derivatives +The purpose of this script is to provide a tool to install, customize and tweak a fresh installation of Linux Mint 18.x/19.x, Ubuntu 16.04/18.04 and derivatives + +The Linux Mint 18 branch is now freezed and only bugs will be fixed. + +New features are only added to Linux Mint 19 branch from now. Installation ------------ @@ -33,7 +37,7 @@ Credits This script has been written by Francois B. (Makotosan) -* Email : shakasan@sirenacorp.be +* Email : francois@makotonoblog.be * Website : https://makotonoblog.be/ Licence diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index ae20d3f..2e63a78 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -131,6 +131,7 @@ screenfetch;apt;utilities;screenfetch xcalib;apt;utilities;xcalib conky-all;apt;utilities;conky-all plank;apt;utilities;plank +docky;apt;utilities;docky indicator-sound-switcher;apt;utilities;indicator-sound-switcher y-ppa-manager;apt;utilities;y-ppa-manager synapse;apt;utilities;synapse From 0210502bd8ea75f40c5fbcfdf7b7bb82e8443b1e Mon Sep 17 00:00:00 2001 From: "Francois B (Makoto)" Date: Sun, 5 Aug 2018 02:22:25 +0200 Subject: [PATCH 125/261] upd --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 1c1de8e..abdccb6 100644 --- a/README.md +++ b/README.md @@ -16,7 +16,7 @@ Installation Linux Mint 18 -``` +```shell curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - echo "deb https://packagecloud.io/makoto/stable/ubuntu/ xenial main" | sudo tee /etc/apt/sources.list.d/makoto.list sudo apt-get update @@ -25,7 +25,7 @@ sudo apt-get install yggdrasil Linux Mint 19 -``` +```shell curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - echo "deb https://packagecloud.io/makoto/stable/ubuntu/ bionic main" | sudo tee /etc/apt/sources.list.d/makoto.list sudo apt-get update From 74ecf16891d78cd3b932666ba3454484fee5f914 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 12 Aug 2018 14:55:34 +0200 Subject: [PATCH 126/261] idle3 added --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 2e63a78..0994a07 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -182,6 +182,7 @@ PyOpenGL;pip;python;PyOpenGL tweepy;pip;python;tweepy weppy;pip;python;weppy py-term;pip;python;py-term +idle3;apt;python;idle3 jstest-gtk;apt;games;jstest-gtk dosbox;apt;games;dosbox steam;apt;steam;steam From 9dbc09ab85aee33719ea2c7e2101e08e0f4d190e Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 29 Sep 2018 20:47:01 +0200 Subject: [PATCH 127/261] tilix added --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 0994a07..5d29fc2 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -144,6 +144,7 @@ bleachbit;apt;utilities;bleachbit gparted;apt;utilities;gparted gsmartcontrol;apt;utilities;gsmartcontrol terminator;apt;utilities;terminator +tilix;apt;utilities;tilix aptik;apt;utilities;aptik gufw;apt;utilities;gufw numlockx;apt;utilities;numlockx From 28efdeef82f68619289da0bfe55e7841669428fd Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Thu, 4 Oct 2018 22:20:49 +0200 Subject: [PATCH 128/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 7400788..035cdde 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b7" +version="0.5.0-b8" # # myHomedir is used in full paths to the homedir From 894e23dfdb434d427d7cede96b72aa62ce40ce40 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 6 Oct 2018 19:32:58 +0200 Subject: [PATCH 129/261] i386 ver of libnvidia-gl for driver 396 added to fix issue with Steam --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 5d29fc2..e831298 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -295,6 +295,7 @@ libcuda1-390;apt;nvidia-390;libcuda1-390 nvidia-driver-396;apt;nvidia-driver-396;nvidia-driver-396 nvidia-settings;apt;nvidia-driver-396;nvidia-settings nvidia-utils-396;apt;nvidia-driver-396;nvidia-utils-396 +libnvidia-gl-396:i386:apt;nvidia-driver-396;libnvidia-gl-396:i386 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq gpick;apt;dev;gpick From e57e2fe33cac4cefb9f038f86984fdf232befe7b Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 6 Oct 2018 19:41:33 +0200 Subject: [PATCH 130/261] ver num upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 035cdde..dc2bafb 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b8" +version="0.5.0-b9" # # myHomedir is used in full paths to the homedir From 06f4f8d941ae71fffc343ad59d1188e74519de71 Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Tue, 16 Oct 2018 14:37:49 +0200 Subject: [PATCH 131/261] kdocker added --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index e831298..5042f8a 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -162,6 +162,7 @@ rarcrack;apt;utilities;rarcrack pdfcrack;apt;utilities;pdfcrack figlet;apt;utilities;figlet alltray;apt;utilities;alltray +kdocker;apt;utilities;kdocker cheat;pip;utilities;cheat mate-sensors-applet-nvidia;apt;utilities;mate-sensors-applets-nvidia woeusb;apt;utilities;woeusb From 0d596175568bc0eab9e347d0839444dbb646ccd1 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 27 Oct 2018 22:32:32 +0200 Subject: [PATCH 132/261] p7zip-desktop --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 5042f8a..3d2ae56 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -174,6 +174,7 @@ tldr;pip;utilities;tldr gyazo;apt;utilities;gyazo fdupes;apt;utilities;fdupes vulkan-utils;apt;utilities;vulkan-utils +p7zip-desktop;snap;utilities;p7zip-desktop python3-dev;apt;python;python3-dev python3-pip;apt;python;python3-pip python3-pyqt5;apt;python;python3-pyqt5 From 54ca4f9c355af9d56c1e1ee8839d90ec2da6fde7 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 27 Oct 2018 23:39:44 +0200 Subject: [PATCH 133/261] nvidia 410 added and birdtray by ppa --- menus_functions_ub1804.sh | 4 ++++ repo_functions_ub1804.sh | 18 +++++++++++++++--- yggdrasil.sh | 2 +- 3 files changed, 20 insertions(+), 4 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 0f7d63f..966d18a 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -441,6 +441,7 @@ function showHardwareMenu () { "nvidia387" "Install Nvidia 387 graphic drivers" \ "nvidia390" "Install Nvidia 390 graphic drivers" \ "nvidia396" "Install Nvidia 396 graphic drivers" \ + "nvidia410" "Install Nvidia 410 graphic drivers" \ "tlp" "Install/Enable TLP for better power management " \ "keyid" "Add udev rules for Key-ID FIDO U2F usb key" \ "WI6320" "Fix Intel Wireless 6320 card config problem" \ @@ -471,6 +472,9 @@ function showHardwareMenu () { "nvidia396") installAppsFromListMenu nvidia-driver-396 ;; + "nvidia410") + installAppsFromListMenu nvidia-driver-410 + ;; "tlp") installAppsFromListMenu tlp ;; diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 3d2ae56..ec2bcf0 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1,4 +1,4 @@ -#-----------------------------------------------------------------------------# +f#-----------------------------------------------------------------------------# # Yggdrasil NG # # compatibility : see documentation or man pages # # author : Francois B. (Makotosan/Shakasan) # @@ -116,6 +116,7 @@ filezilla;apt;internet;filezilla hexchat;apt;internet;hexchat mumble;apt;internet;mumble geary;apt;internet;geary +birdtray;apt;internet;birdtray corebird;apt;internet;corebird telegram;apt;internet;telegram skypeforlinux;apt;internet;skypeforlinux @@ -173,7 +174,6 @@ coinmon;npm;utilities;coinmon tldr;pip;utilities;tldr gyazo;apt;utilities;gyazo fdupes;apt;utilities;fdupes -vulkan-utils;apt;utilities;vulkan-utils p7zip-desktop;snap;utilities;p7zip-desktop python3-dev;apt;python;python3-dev python3-pip;apt;python;python3-pip @@ -298,6 +298,10 @@ nvidia-driver-396;apt;nvidia-driver-396;nvidia-driver-396 nvidia-settings;apt;nvidia-driver-396;nvidia-settings nvidia-utils-396;apt;nvidia-driver-396;nvidia-utils-396 libnvidia-gl-396:i386:apt;nvidia-driver-396;libnvidia-gl-396:i386 +nvidia-driver-410;apt;nvidia-driver-410;nvidia-driver-410 +nvidia-settings;apt;nvidia-driver-410;nvidia-settings +nvidia-utils-410;apt;nvidia-driver-410;nvidia-utils-410 +libnvidia-gl-410:i386:apt;nvidia-driver-410;libnvidia-gl-410:i386 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq gpick;apt;dev;gpick @@ -516,7 +520,15 @@ yad;addRepo_Webupd8 woeusb;addRepo_Webupd8 cpu-g;addRepo_Atareao iridiumbrowser;addRepo_Iridium -picard;addRepo_Picard" +picard;addRepo_Picard +birdtray;addRepo_Birdtray" + +# +# Birdtray (for Thunderbird) +# +function addRepo_Birdtray () { + addPPA ppa:linuxuprising/apps +} # # MusicBrainz Picard diff --git a/yggdrasil.sh b/yggdrasil.sh index 76d1e5c..7104d55 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -228,7 +228,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do updateSystem ygginitCount=true fi - installAppsFromList nvidia-driver-396 + installAppsFromList nvidia-driver-410 ;; k) if [ $ygginitCount = false ]; then From 425fa45c304ef4978f98a476b0c3a98784cbba69 Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Mon, 29 Oct 2018 10:18:18 +0100 Subject: [PATCH 134/261] youtube-dl(g) added --- repo_functions_ub1804.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index ec2bcf0..9950d8d 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -126,6 +126,8 @@ deluge-torrent;apt;internet;deluge-torrent vivaldi-stable;apt;internet;vivaldi-stable transmission-gtk;apt;internet;transmission-gtk iridium-browser;apt;internet;iridiumbrowser +youtube-dl;apt;internet;youtube-dl +youtube-dlg;apt;internet;youtube-dlg qtqr;apt;utilities;qtqr cpu-g;apt;utilities;cpu-g screenfetch;apt;utilities;screenfetch From f7f2bee4375a07f11a706be866b53d503a7e58f1 Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Sat, 3 Nov 2018 04:49:55 +0100 Subject: [PATCH 135/261] some lib and pkg needed for python/pygobject/cairo dev added --- repo_functions_ub1804.sh | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 9950d8d..a486a5c 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -188,6 +188,26 @@ tweepy;pip;python;tweepy weppy;pip;python;weppy py-term;pip;python;py-term idle3;apt;python;idle3 +python-gi;apt;python;python-gi +python-gi-cairo;apt;python;python-gi-cairo +python3-gi;apt;python;python3-gi +python3-gi-cairo;apt;python;python3-gi-cairo +python3-venv;apt;python;python3-venv +python3-wheel;apt;python;python3-wheel +libgirepository1.0-dev;apt;python;libgirepository1.0-dev +libbz2-dev;apt;python;libbz2-dev +libreadline-dev;apt;python;libreadline-dev +libssl-dev;apt;python;libssl-dev +zlib1g-dev;apt;python;zlib1g-dev +libsqlite3-dev;apt;python;libsqlite3-dev +llvm;apt;python;llvm +libncurses5-dev;apt;python;libncurses5-dev +libncursesw5-dev;apt;python;libncursesw5-dev +xz-utils;apt;python;xz-utils +tk-dev;apt;python;tk-dev +libcairo2-dev;apt;python;libcairo2-dev +virtualenv;pip;python;virtualenv +pipenv;pip;python;pipenv jstest-gtk;apt;games;jstest-gtk dosbox;apt;games;dosbox steam;apt;steam;steam From dfbda273d176de3ce8a51aa4a38a3ef179ccc7eb Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 17 Nov 2018 17:53:23 +0100 Subject: [PATCH 136/261] plata theme added by ppa --- repo_functions_ub1804.sh | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index a486a5c..b65a17a 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -295,6 +295,7 @@ purple-facebook;apt;pidgin;purple-facebook unbound;apt;unbound;unbound arc-theme;apt;gtkthemes;arc-theme numix-gtk-theme;apt;gtkthemes;numix-gtk-theme +plata-theme;apt;gtkthemes;plata-theme faenza-icon-theme;apt;icons;faenza-icon-theme numix-icon-theme;apt;icons;numix-icon-theme numix-icon-theme-circle;apt;icons;numix-icon-theme-circle @@ -478,6 +479,7 @@ simplescreenrecorder-lib:i386;addRepo_SimpleScreenRecorder zim;addRepo_Zim grub-customizer;addRepo_GrubCustomizer numix-gtk-theme;addRepo_Numix +plata-theme;addRepo_Plata numix-icon-theme;addRepo_Numix numix-icon-theme-circle;addRepo_Numix rhythmbox-plugin-alternative-toolbar;addRepo_Rhythmbox @@ -545,6 +547,13 @@ iridiumbrowser;addRepo_Iridium picard;addRepo_Picard birdtray;addRepo_Birdtray" +# +# Plata Theme +# +function addRepo_Plata () { + addPPA ppa:tista/plata-theme +} + # # Birdtray (for Thunderbird) # From 7fc9a4245a75a63988c6c397a633140f2afd8fc9 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 17 Nov 2018 18:02:56 +0100 Subject: [PATCH 137/261] ver num upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index dc2bafb..0b5edf8 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b9" +version="0.5.0-b10" # # myHomedir is used in full paths to the homedir From ce83b9520425cb669cc07151b063a0e84513722f Mon Sep 17 00:00:00 2001 From: "whitesource-bolt-for-github[bot]" Date: Thu, 6 Dec 2018 20:25:05 +0000 Subject: [PATCH 138/261] Initial WhiteSource configuration file --- .whitesource | 8 ++++++++ 1 file changed, 8 insertions(+) create mode 100644 .whitesource diff --git a/.whitesource b/.whitesource new file mode 100644 index 0000000..5ef5902 --- /dev/null +++ b/.whitesource @@ -0,0 +1,8 @@ +########################################################## +#### WhiteSource "Bolt for Github" configuration file #### +########################################################## + +# Configuration # +#---------------# +ws.repo.scan=true +vulnerable.check.run.conclusion.level=success \ No newline at end of file From 00d60968ac8bc15838e8f7564c832652a46d0968 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 15 Dec 2018 23:47:30 +0100 Subject: [PATCH 139/261] MongoDB upd 3.6->4.0 + Makoto repo added --- repo_functions_ub1604.sh | 9 +++++++++ repo_functions_ub1804.sh | 17 +++++++++++++---- vars.sh | 2 +- yggdrasil.sh | 14 +++++++++----- 4 files changed, 32 insertions(+), 10 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index 4f9fb1b..a086cb8 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -628,6 +628,15 @@ woeusb;addRepo_Webupd8 iridiumbrowser;addRepo_Iridium picard;addRepo_Picard" +# +# Makoto no blog repo +# +function addRepo_Makoto () { + addKey "https://packagecloud.io/makoto/stable/gpgkey" + addRepo makoto.list \ + "deb https://packagecloud.io/makoto/stable/ubuntu/ xenial main" +} + # # MusicBrainz Picard # diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index b65a17a..ca3922d 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -547,6 +547,15 @@ iridiumbrowser;addRepo_Iridium picard;addRepo_Picard birdtray;addRepo_Birdtray" +# +# Makoto no blog repo +# +function addRepo_Makoto () { + addKey "https://packagecloud.io/makoto/stable/gpgkey" + addRepo makoto.list \ + "deb https://packagecloud.io/makoto/stable/ubuntu/ bionic main" +} + # # Plata Theme # @@ -1002,12 +1011,12 @@ function addRepo_Gyazo () { } # -# MongoDB 3 CE +# MongoDB 4 CE # function addRepo_MongoDB3CE () { - addKey "https://www.mongodb.org/static/pgp/server-3.6.asc" - addRepo "mongodb-org-3.6.list" \ - "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" + addKey "https://www.mongodb.org/static/pgp/server-4.0.asc" + addRepo "mongodb-org-4.0.list" \ + "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" } # diff --git a/vars.sh b/vars.sh index 0b5edf8..2330d34 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b10" +version="0.5.0-b11" # # myHomedir is used in full paths to the homedir diff --git a/yggdrasil.sh b/yggdrasil.sh index 7104d55..9248c1a 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -316,9 +316,10 @@ mainMenuOptions=$(whiptail \ "7" "System Config" \ "8" "Hardware" \ "9" "System Tools" \ -"10" "Reboot this computer" \ -"11" "About Yggdrasil" \ -"12" "Quit" 3>&1 1>&2 2>&3) +"10" "Add Makoto no Blog repository" \ +"11" "Reboot this computer" \ +"12" "About Yggdrasil" \ +"13" "Quit" 3>&1 1>&2 2>&3) case $mainMenuOptions in "1") @@ -350,12 +351,15 @@ case $mainMenuOptions in showSysToolsMenu ;; "10") - showRebootBoxMenu + addRepo_Makoto ;; "11") - showAboutBoxMenu + showRebootBoxMenu ;; "12") + showAboutBoxMenu + ;; + "13") exit ;; esac # main menu From b4182f283ab30cbae20ae5434ffe023ae46c23e1 Mon Sep 17 00:00:00 2001 From: Francois B Date: Wed, 19 Dec 2018 15:30:35 +0100 Subject: [PATCH 140/261] virtualbox 5.2 -> 6.0 --- repo_functions_ub1804.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index ca3922d..9cd209e 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -328,7 +328,7 @@ libnvidia-gl-410:i386:apt;nvidia-driver-410;libnvidia-gl-410:i386 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq gpick;apt;dev;gpick -virtualbox-5.2;apt;dev;virtualbox-5.2 +virtualbox-6.0;apt;dev;virtualbox-6.0 build-essential;apt;dev;build-essential ubuntu-make;apt;dev;ubuntu-make ghex;apt;dev;ghex @@ -430,7 +430,7 @@ ansible;addRepo_Ansible etcher-electron;addRepo_Etcher sublime-text;addRepo_SublimeText vivaldi-stable;addRepo_Vivaldi -virtualbox-5.2;addRepo_VirtualBox +virtualbox-6.0;addRepo_VirtualBox syncthing;addRepo_Syncthing syncthinggtk;addRepo_SyncthingGtk opera-stable;addRepo_Opera From 1734fa97c416f4ddfc4d513da762db19c81981b4 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 28 Dec 2018 15:30:56 +0100 Subject: [PATCH 141/261] handrabke -> handbrake-gtk/cli + kdenlive added by ppa --- repo_functions_ub1804.sh | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 9cd209e..9860a4d 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -66,7 +66,8 @@ openshot;apt;multimedia;openshot smplayer;apt;multimedia;smplayer smplayer-themes;apt;multimedia;smplayer-themes smplayer-l10n;apt;multimedia;smplayer-l10n -handbrake;apt;multimedia;handbrake +handbrake-cli;apt;multimedia;handbrake-cli +handbrake-gtk;apt;multimedia;handbrake-gtk avidemux2.6-qt;apt;multimedia;avidemux2.6-qt avidemux2.6-plugins-qt;apt;multimedia;avidemux2.6-plugins-qt mjpegtools;apt;multimedia;mjpegtools @@ -103,6 +104,7 @@ python-musicbrainz2;apt;multimedia;python-musicbrainz2 gmusicbrowser;apt;multimedia;gmusicbrowser peek;apt;multimedia;peek bino;apt;multimedia;bino +kdenlive;apt;multimedia;kdenlive syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync @@ -454,7 +456,8 @@ avidemux2.6-plugins-qt;addRepo_Avidemux2.6 avidemux2.6-qt;addRepo_Avidemux2.6 quiterss;addRepo_Quiterss transmission-gtk;addRepo_Transmissionbt -handbrake;addRepo_Handbrake +handbrake-cli;addRepo_Handbrake +handbrake-gtk;addRepo_Handbrake notepadqq;addRepo_Notepadqq flacon;addRepo_Flacon y-ppa-manager;addRepo_YPPAManager @@ -545,7 +548,15 @@ woeusb;addRepo_Webupd8 cpu-g;addRepo_Atareao iridiumbrowser;addRepo_Iridium picard;addRepo_Picard -birdtray;addRepo_Birdtray" +birdtray;addRepo_Birdtray +kdenlive;addRepo_KDEnlive" + +# +# KDEnlive +# +function addRepo_KDEnlive () { + addPPA ppa:kdenlive/kdenlive-stable +} # # Makoto no blog repo From 5e4a63bdc6e3e7595e714fafaf8d2f3f2d7dd350 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 28 Dec 2018 15:58:24 +0100 Subject: [PATCH 142/261] pdfarranger added by ppa --- repo_functions_ub1804.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 9860a4d..db363c5 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -161,6 +161,7 @@ qt4-qtconfig;apt;utilities;qt4-qtconfig byobu;apt;utilities;byobu mupdf;apt;utilities;mupdf mupdf-tools;apt;utilities;mupdf-tools +pdfarranger;apt;utilities;pdfarranger ukuu;apt;utilities;ukuu fcrackzip;apt;utilities;fcrackzip rarcrack;apt;utilities;rarcrack @@ -548,7 +549,8 @@ woeusb;addRepo_Webupd8 cpu-g;addRepo_Atareao iridiumbrowser;addRepo_Iridium picard;addRepo_Picard -birdtray;addRepo_Birdtray +birdtray;addRepo_Linuxuprising +pdfarranger;addRepo_Linuxuprising kdenlive;addRepo_KDEnlive" # @@ -575,9 +577,9 @@ function addRepo_Plata () { } # -# Birdtray (for Thunderbird) +# LinuxUpRising repo (Birdtray (for Thunderbird), PDFArranger) # -function addRepo_Birdtray () { +function addRepo_Linuxuprising () { addPPA ppa:linuxuprising/apps } From a50f29c52c1e8a332eeb307016f7e2e242f78eaf Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 28 Dec 2018 16:12:41 +0100 Subject: [PATCH 143/261] gitkraken added by snap + nvidia upd from 410 to 415 --- menus_functions_ub1804.sh | 8 ++++++++ repo_functions_ub1804.sh | 7 ++++++- yggdrasil.sh | 2 +- 3 files changed, 15 insertions(+), 2 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 966d18a..f616e8f 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -221,6 +221,7 @@ function showDevInstallMenu () { "teamviewer13" "Teamviewer 13" \ "boostnotes" "Boostnotes Markdown wiki app" \ "compass" "MongoDB Compass GUI" \ + "gitkraken" "Gitkraken git gui" \ "Back" "Back" 3>&1 1>&2 2>&3) case $devInstallMenuOptions in @@ -296,6 +297,9 @@ function showDevInstallMenu () { "compass") installCompassMenu ;; + "gitkraken") + installAppsFromListMenu gitkraken + ;; "Back") break ;; @@ -442,6 +446,7 @@ function showHardwareMenu () { "nvidia390" "Install Nvidia 390 graphic drivers" \ "nvidia396" "Install Nvidia 396 graphic drivers" \ "nvidia410" "Install Nvidia 410 graphic drivers" \ + "nvidia415" "Install Nvidia 415 graphic drivers" \ "tlp" "Install/Enable TLP for better power management " \ "keyid" "Add udev rules for Key-ID FIDO U2F usb key" \ "WI6320" "Fix Intel Wireless 6320 card config problem" \ @@ -475,6 +480,9 @@ function showHardwareMenu () { "nvidia410") installAppsFromListMenu nvidia-driver-410 ;; + "nvidia415") + installAppsFromListMenu nvidia-driver-415 + ;; "tlp") installAppsFromListMenu tlp ;; diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index db363c5..0ee5b45 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -328,6 +328,10 @@ nvidia-driver-410;apt;nvidia-driver-410;nvidia-driver-410 nvidia-settings;apt;nvidia-driver-410;nvidia-settings nvidia-utils-410;apt;nvidia-driver-410;nvidia-utils-410 libnvidia-gl-410:i386:apt;nvidia-driver-410;libnvidia-gl-410:i386 +nvidia-driver-415;apt;nvidia-driver-415;nvidia-driver-415 +nvidia-settings;apt;nvidia-driver-415;nvidia-settings +nvidia-utils-415;apt;nvidia-driver-415;nvidia-utils-415 +libnvidia-gl-415:i386:apt;nvidia-driver-415;libnvidia-gl-415:i386 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq gpick;apt;dev;gpick @@ -411,7 +415,8 @@ fbreader;apt;ebook;fbreader calibre;apt;ebook;calibre android-studio;apt;androidstudio;androidstudio intellij-idea-community;snap;idea;idea -eclipse;snap;eclipse;eclipse" +eclipse;snap;eclipse;eclipse +gitkraken;snap;gitkraken;gitkraken" #-----------------------------------------------------------------------------# # Specific Repo list and functions # diff --git a/yggdrasil.sh b/yggdrasil.sh index 9248c1a..dce0dee 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -228,7 +228,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do updateSystem ygginitCount=true fi - installAppsFromList nvidia-driver-410 + installAppsFromList nvidia-driver-415 ;; k) if [ $ygginitCount = false ]; then From 2c9c0293c85655bad86fd3ce3f70ecbfeebcbcff Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 28 Dec 2018 16:18:17 +0100 Subject: [PATCH 144/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 2330d34..2230fb2 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b11" +version="0.5.0-b12" # # myHomedir is used in full paths to the homedir From 823cdf80a12616e3a40aa731c51b250bfc3c015d Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 28 Dec 2018 16:20:46 +0100 Subject: [PATCH 145/261] small bug fixed --- repo_functions_ub1804.sh | 2 +- vars.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 0ee5b45..41c0f45 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1,4 +1,4 @@ -f#-----------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# # Yggdrasil NG # # compatibility : see documentation or man pages # # author : Francois B. (Makotosan/Shakasan) # diff --git a/vars.sh b/vars.sh index 2230fb2..bb7f713 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b12" +version="0.5.0-b13" # # myHomedir is used in full paths to the homedir From db6f0a49c75a2bf74e6079d13deccd030d5fb1de Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Mon, 28 Jan 2019 13:34:36 +0100 Subject: [PATCH 146/261] youtube-dl install by pip instead of apt --- repo_functions_ub1804.sh | 7 ++++++- vars.sh | 2 +- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 41c0f45..fb54968 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -128,7 +128,7 @@ deluge-torrent;apt;internet;deluge-torrent vivaldi-stable;apt;internet;vivaldi-stable transmission-gtk;apt;internet;transmission-gtk iridium-browser;apt;internet;iridiumbrowser -youtube-dl;apt;internet;youtube-dl +youtube-dl;pip;internet;youtube-dl youtube-dlg;apt;internet;youtube-dlg qtqr;apt;utilities;qtqr cpu-g;apt;utilities;cpu-g @@ -1148,6 +1148,11 @@ function dockerio_PostTrtFct () { "start docker service" runCmd "sudo systemctl enable docker" \ "add docker service at boot" + rundCmd "sudo groupadd docker" \ + "add docker group" + cUser=$(whoami) + rundCmd "sudo usermod -aG docker $cUser" \ + "add current user to docker group" } # diff --git a/vars.sh b/vars.sh index bb7f713..c4ebc56 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b13" +version="0.5.0-b15" # # myHomedir is used in full paths to the homedir From 392d039f2660e6a61952a516257841d8fc862d3d Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 17 Feb 2019 00:19:15 +0100 Subject: [PATCH 147/261] small bug fixed --- repo_functions_ub1804.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index fb54968..0c20ef6 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -323,15 +323,15 @@ libcuda1-390;apt;nvidia-390;libcuda1-390 nvidia-driver-396;apt;nvidia-driver-396;nvidia-driver-396 nvidia-settings;apt;nvidia-driver-396;nvidia-settings nvidia-utils-396;apt;nvidia-driver-396;nvidia-utils-396 -libnvidia-gl-396:i386:apt;nvidia-driver-396;libnvidia-gl-396:i386 +libnvidia-gl-396:i386;apt;nvidia-driver-396;libnvidia-gl-396:i386 nvidia-driver-410;apt;nvidia-driver-410;nvidia-driver-410 nvidia-settings;apt;nvidia-driver-410;nvidia-settings nvidia-utils-410;apt;nvidia-driver-410;nvidia-utils-410 -libnvidia-gl-410:i386:apt;nvidia-driver-410;libnvidia-gl-410:i386 +libnvidia-gl-410:i386;apt;nvidia-driver-410;libnvidia-gl-410:i386 nvidia-driver-415;apt;nvidia-driver-415;nvidia-driver-415 nvidia-settings;apt;nvidia-driver-415;nvidia-settings nvidia-utils-415;apt;nvidia-driver-415;nvidia-utils-415 -libnvidia-gl-415:i386:apt;nvidia-driver-415;libnvidia-gl-415:i386 +libnvidia-gl-415:i386;apt;nvidia-driver-415;libnvidia-gl-415:i386 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq gpick;apt;dev;gpick From be221799c3b569fadc02faf2b96258919524d1af Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 17 Feb 2019 00:20:04 +0100 Subject: [PATCH 148/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index c4ebc56..f9d71ac 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b15" +version="0.5.0-b16" # # myHomedir is used in full paths to the homedir From 6f65906c1f36106110d57b96bee9e1b7b956d25e Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 Feb 2019 16:46:24 +0100 Subject: [PATCH 149/261] MEGASync client re-added --- repo_functions_ub1804.sh | 13 ++++++++++++- vars.sh | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 0c20ef6..da235cb 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -108,6 +108,7 @@ kdenlive;apt;multimedia;kdenlive syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync +megasync;apt;internet;megasync discord;snap;internet;discord quiterss;apt;internet;quiterss opera-stable;apt;internet;opera-stable @@ -556,7 +557,17 @@ iridiumbrowser;addRepo_Iridium picard;addRepo_Picard birdtray;addRepo_Linuxuprising pdfarranger;addRepo_Linuxuprising -kdenlive;addRepo_KDEnlive" +kdenlive;addRepo_KDEnlive +megasync;addRepo_MEGA" + +# +# MEGASync +# +function addRepo_MEGA () { + addKey "https://mega.nz/linux/MEGAsync/xUbuntu_18.04/Release.key" + addRepo megasync.list \ + "deb https://mega.nz/linux/MEGAsync/xUbuntu_18.04/ ./" +} # # KDEnlive diff --git a/vars.sh b/vars.sh index f9d71ac..f97b5ed 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b16" +version="0.5.0-b17" # # myHomedir is used in full paths to the homedir From a06d856d2a81ce3417096200a6e0b0b22a6385b9 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 Feb 2019 16:58:37 +0100 Subject: [PATCH 150/261] nautilus/thunar megasync ext added + megacmd --- repo_functions_ub1804.sh | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index da235cb..c23273b 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -109,6 +109,7 @@ syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync megasync;apt;internet;megasync +megacmd;apt;internet;megasync discord;snap;internet;discord quiterss;apt;internet;quiterss opera-stable;apt;internet;opera-stable @@ -1149,10 +1150,23 @@ plank;plank_PostTrtFct androidstudio;android_PostTrtFct nodejs8lts;nodejs8lts_PostTrtFct angularcli;angularcli_PostTrtFct -dockerio;dockerio_PostTrtFct" +dockerio;dockerio_PostTrtFct +megasync;megasync_PostTrtFct" # +# MEGASync # +function megasync_PostTrtFct () { + if which thunar >/dev/null; then + installPackage apt thunar-megasync + fi + if which nautilus >/dev/null; then + installPackage apt nautilus-megasync + fi +} + +# +# Docker # function dockerio_PostTrtFct () { runCmd "sudo systemctl start docker" \ From e4e34b4622e8923f353ff4b53634abc426c78048 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 Feb 2019 16:59:32 +0100 Subject: [PATCH 151/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index f97b5ed..0583f75 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b17" +version="0.5.0-b18" # # myHomedir is used in full paths to the homedir From 963225f604234bfcf1440d3860b96afe2a108923 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 3 Mar 2019 15:50:35 +0100 Subject: [PATCH 152/261] gnome-twitch added by snap --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index c23273b..ef36917 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -132,6 +132,7 @@ transmission-gtk;apt;internet;transmission-gtk iridium-browser;apt;internet;iridiumbrowser youtube-dl;pip;internet;youtube-dl youtube-dlg;apt;internet;youtube-dlg +gnome-twitch;snap;internet;gnome-twitch qtqr;apt;utilities;qtqr cpu-g;apt;utilities;cpu-g screenfetch;apt;utilities;screenfetch From 64b63fcc1a5c4369575a7b6c594229d3068c9f7d Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Fri, 8 Mar 2019 09:06:17 +0100 Subject: [PATCH 153/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 0583f75..d85671c 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b18" +version="0.5.0-b19" # # myHomedir is used in full paths to the homedir From 6c9d18b0e54aeec6270023886a203902e0c8cf84 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 13 Mar 2019 19:03:05 +0100 Subject: [PATCH 154/261] gallery-dl --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index ef36917..b959b2a 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -133,6 +133,7 @@ iridium-browser;apt;internet;iridiumbrowser youtube-dl;pip;internet;youtube-dl youtube-dlg;apt;internet;youtube-dlg gnome-twitch;snap;internet;gnome-twitch +gallery-dl;pip;internet;gallery-dl qtqr;apt;utilities;qtqr cpu-g;apt;utilities;cpu-g screenfetch;apt;utilities;screenfetch From f332b0bf8f61d9ac866285f5429f4117b480d29c Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 15 Mar 2019 21:35:35 +0100 Subject: [PATCH 155/261] dcfldd added --- repo_functions_ub1804.sh | 1 + vars.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index b959b2a..99a0a20 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -39,6 +39,7 @@ debconf-utils;apt;base;debconf-utils idle3-tools;apt;base;idle3-tools snapd;apt;base;snapd sysstat;apt;base;sysstat +dcfldd;apt;base;dcfldd spotify;snap;multimedia;spotify sayonara;apt;multimedia;sayonara qmmp;apt;multimedia;qmmp diff --git a/vars.sh b/vars.sh index d85671c..e996308 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b19" +version="0.5.0-b20" # # myHomedir is used in full paths to the homedir From 398a2ea680244353fd43ff0b246759775c262a5f Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Thu, 25 Apr 2019 19:16:00 +0200 Subject: [PATCH 156/261] Lutris added by PPA --- repo_functions_ub1804.sh | 11 ++++++++++- vars.sh | 2 +- 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 99a0a20..e9337c2 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -218,6 +218,7 @@ virtualenv;pip;python;virtualenv pipenv;pip;python;pipenv jstest-gtk;apt;games;jstest-gtk dosbox;apt;games;dosbox +lutris;apt;games;lutris steam;apt;steam;steam brasero;apt;burningtools;brasero k3b;apt;burningtools;k3b @@ -562,7 +563,15 @@ picard;addRepo_Picard birdtray;addRepo_Linuxuprising pdfarranger;addRepo_Linuxuprising kdenlive;addRepo_KDEnlive -megasync;addRepo_MEGA" +megasync;addRepo_MEGA +lutris;addRepo_Lutris" + +# +# Lutris +# +function addRepo_Lutris () { + addPPA ppa:lutris-team/lutris +} # # MEGASync diff --git a/vars.sh b/vars.sh index e996308..a8b458a 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b20" +version="0.5.0-b21" # # myHomedir is used in full paths to the homedir From 89ee320f0a07355adde6dc8727fab2c1c900a604 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Thu, 25 Apr 2019 19:24:03 +0200 Subject: [PATCH 157/261] Etcher removed as no repo available anymore....... --- repo_functions_ub1604.sh | 12 ------------ repo_functions_ub1804.sh | 12 ------------ vars.sh | 2 +- 3 files changed, 1 insertion(+), 25 deletions(-) diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh index a086cb8..a3a80cd 100644 --- a/repo_functions_ub1604.sh +++ b/repo_functions_ub1604.sh @@ -181,7 +181,6 @@ mate-sensors-applet-nvidia;apt;utilities;mate-sensors-applets-nvidia woeusb;apt;utilities;woeusb screenkey;apt;utilities;screenkey tmsu;apt;utilities;tmsu -etcher-electron;apt;utilities;etcher-electron pdfgrep;apt;utilities;pdfgrep coinmon;npm;utilities;coinmon tldr;pip;utilities;tldr @@ -465,7 +464,6 @@ code;addRepo_VSCode androidstudio;addRepo_AndroidStudio docker-ce;addRepo_DockerCE ansible;addRepo_Ansible -etcher-electron;addRepo_Etcher sublime-text;addRepo_SublimeText vivaldi-stable;addRepo_Vivaldi virtualbox-5.2;addRepo_VirtualBox @@ -1110,16 +1108,6 @@ function addRepo_SublimeText () { "deb https://download.sublimetext.com/ apt/dev/" } -# -# Etcher -# -function addRepo_Etcher () { - addKey "hkp://pgp.mit.edu:80" \ - "379CE192D401AB61" - addRepo "etcher.list" \ - "deb https://dl.bintray.com/resin-io/debian stable etcher" -} - # # Ansible # diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index e9337c2..8645b25 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -178,7 +178,6 @@ cheat;pip;utilities;cheat mate-sensors-applet-nvidia;apt;utilities;mate-sensors-applets-nvidia woeusb;apt;utilities;woeusb screenkey;apt;utilities;screenkey -etcher-electron;apt;utilities;etcher-electron pdfgrep;apt;utilities;pdfgrep coinmon;npm;utilities;coinmon tldr;pip;utilities;tldr @@ -441,7 +440,6 @@ code;addRepo_VSCode androidstudio;addRepo_AndroidStudio docker-ce;addRepo_DockerCE ansible;addRepo_Ansible -etcher-electron;addRepo_Etcher sublime-text;addRepo_SublimeText vivaldi-stable;addRepo_Vivaldi virtualbox-6.0;addRepo_VirtualBox @@ -1016,16 +1014,6 @@ function addRepo_SublimeText () { "deb https://download.sublimetext.com/ apt/dev/" } -# -# Etcher -# -function addRepo_Etcher () { - addKey "hkp://pgp.mit.edu:80" \ - "379CE192D401AB61" - addRepo "etcher.list" \ - "deb https://dl.bintray.com/resin-io/debian stable etcher" -} - # # Ansible # diff --git a/vars.sh b/vars.sh index a8b458a..900d62b 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b21" +version="0.5.0-b22" # # myHomedir is used in full paths to the homedir From 8f386bcd598204b2835946e405b57ffb64ddaad3 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 30 Jun 2019 18:07:26 +0200 Subject: [PATCH 158/261] add new repo for guake --- repo_functions_ub1804.sh | 13 +++++++++++-- vars.sh | 2 +- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 8645b25..ad2e1fa 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -562,7 +562,8 @@ birdtray;addRepo_Linuxuprising pdfarranger;addRepo_Linuxuprising kdenlive;addRepo_KDEnlive megasync;addRepo_MEGA -lutris;addRepo_Lutris" +lutris;addRepo_Lutris +guake;addRepo_LinuxUprising_Guake" # # Lutris @@ -644,7 +645,15 @@ function addRepo_SyncthingGtk () { } # -# Audacious, Guake +# Linux Uprising (Guake) +# + +function addRepo_LinuxUprising_Guake () { + addPPA ppa:linuxuprising/guake +} + +# +# Webupd8 (Audacious, ...) # function addRepo_Webupd8 () { addPPA ppa:nilarimogard/webupd8 diff --git a/vars.sh b/vars.sh index 900d62b..56d2f3d 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b22" +version="0.5.0-b23" # # myHomedir is used in full paths to the homedir From a49dba0621cf6869edcea4bac7e06b8b41d4a0bc Mon Sep 17 00:00:00 2001 From: "whitesource-bolt-for-github[bot]" <42819689+whitesource-bolt-for-github[bot]@users.noreply.github.com> Date: Sun, 30 Jun 2019 16:07:33 +0000 Subject: [PATCH 159/261] Migrate WhiteSource configuration file to json format --- .whitesource | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/.whitesource b/.whitesource index 5ef5902..c15191b 100644 --- a/.whitesource +++ b/.whitesource @@ -1,8 +1,8 @@ -########################################################## -#### WhiteSource "Bolt for Github" configuration file #### -########################################################## - -# Configuration # -#---------------# -ws.repo.scan=true -vulnerable.check.run.conclusion.level=success \ No newline at end of file +{ + "generalSettings": { + "shouldScanRepo": true + }, + "checkRunSettings": { + "vulnerableCheckRunConclusionLevel": "success" + } +} \ No newline at end of file From d6268632844e27f4da33ae12b35ffcf493fb0f67 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 9 Jul 2019 22:36:54 +0200 Subject: [PATCH 160/261] Nvidia drivers removed + Ubuntu 16.04/Linux Mint 18 removed --- core_functions.sh | 13 +- install_functions_ub1604.sh | 177 ----- menus_functions_ub1604.sh | 507 ------------- menus_functions_ub1804.sh | 24 - repo_functions_ub1604.sh | 1422 ----------------------------------- repo_functions_ub1804.sh | 66 +- vars.sh | 2 +- yggdrasil.sh | 31 +- 8 files changed, 12 insertions(+), 2230 deletions(-) delete mode 100644 install_functions_ub1604.sh delete mode 100644 menus_functions_ub1604.sh delete mode 100644 repo_functions_ub1604.sh diff --git a/core_functions.sh b/core_functions.sh index e5e4b0d..9c9eb60 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -227,15 +227,6 @@ function yggInit () { fi } -# -# update kernel to the latest version -# -function kernelUpdate () { - checkAndInstallDep apt ukuu ukuu \ - && runCmd "sudo ukuu --install-latest --yes" \ - "installing latest kernel" -} - # # system update #TODO: add pip, npm (yarn?), gem @@ -618,7 +609,7 @@ function dispLogo () { printf " ╚██╔╝ ██║ ██║██║ ██║██║ ██║██╔══██╗██╔══██║╚════██║██║██║ \n" printf " ██║ ╚██████╔╝╚██████╔╝██████╔╝██║ ██║██║ ██║███████║██║███████╗\n" printf " ╚═╝ ╚═════╝ ╚═════╝ ╚═════╝ ╚═╝ ╚═╝╚═╝ ╚═╝╚══════╝╚═╝╚══════╝\n" - printf "$BOLDROUGE Customize Linux Mint & Ubuntu derivatives made easier\n" + printf "$BOLDROUGE Customize Linux Mint & Ubuntu made easier\n" printf "$BOLDBLANC ver "$version" - GPLv3 - Francois B. (Makotosan) - makotonoblog.be\n" printf $NORMAL printf "\n" @@ -640,8 +631,6 @@ function usage () { printf " "$BOLDVERT"-q"$NORMAL" : install cardreader apps\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"-n"$NORMAL" : install lastest Nvidia graphic drivers\n" - printf " "$BOLDVERT"-k"$NORMAL" : update system to the latest kernel\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" diff --git a/install_functions_ub1604.sh b/install_functions_ub1604.sh deleted file mode 100644 index 03e8247..0000000 --- a/install_functions_ub1604.sh +++ /dev/null @@ -1,177 +0,0 @@ -#-----------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : see documentation or man pages # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#-----------------------------------------------------------------------------# - -#-----------------------------------------------------------------------------# -# install functions # -#-----------------------------------------------------------------------------# - -# -# Viber (headless) -# -function installViber () { - installPackageDpkg http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb \ - viber.deb \ - no -} - -# -# Viber (Menu) -# -function installViberMenu () { - installPackageDpkg http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb \ - viber.deb \ - yes -} - -# -# Franz (headless) -# -function installFranz () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.18/franz_5.0.0-beta.18_amd64.deb \ - franz.deb \ - no -} - -# -# Franz (Menu) -# -function installFranzMenu () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.18/franz_5.0.0-beta.18_amd64.deb \ - franz.deb \ - yes -} - -# -# Slack (headless) -# -function installSlack () { - installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.2.1-amd64.deb \ - slack.deb \ - no -} - -# -# Slack (Menu) -# -function installSlackMenu () { - installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.2.1-amd64.deb \ - slack.deb \ - yes -} - -# -# update AMD/Intel CPU Microcode -# -function updateMicrocode () { - msg "CPU Microcode updating" - oldMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` - intel=`cat /proc/cpuinfo | grep -i Intel | wc -l` - amd=`cat /proc/cpuinfo | grep -i Amd | wc -l` - if [ "$intel" -gt "0" ]; then - installPackage apt intel-microcode - newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` - printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" - elif [ "$amd" -gt "0" ]; then - installPackage apt amd64-microcode - newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` - printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" - else - printf "[INFO] No Intel/AMD CPU found" - fi - printf "\n" -} - -# -# fix some config issue with Intel Wireless 6320 cards -# -function fixWirelessIntel6320 () { - runCmd "sudo cp /etc/modprobe.d/iwlwifi.conf /etc/modprobe.d/iwlwifi.conf.bak" \ - "backing up config file" - runCmd "echo options iwlwifi bt_coex_active=0 swcrypto=1 11n_disable=8 | sudo tee /etc/modprobe.d/iwlwifi.conf" \ - "applying new config" - printf "[INFO] reboot required !!!" - printf "\n" -} - -# -# Key-ID USB Fido U2F device udev rules -# -function installKeyIDuDev () { - printf "[CMD] Adding Key-ID device UDEV rules " - -cat << EOF | sudo tee /etc/udev/rules.d/70-u2f.rules -# this udev file should be used with udev 188 and newer\n\ -ACTION!="add|change", GOTO="u2f_end" - -# Key-ID FIDO U2F -KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0850|0880", TAG+="uaccess" - -LABEL="u2f_end" -EOF - - ret_code=$? - retCode $ret_code - - runCmd "sudo service udev restart" \ - "restarting UDEV service" -} - -# -# install Teamviewer 13 (headless) -# -function installTeamViewer13 () { - installPackageDpkg https://download.teamviewer.com/download/linux/teamviewer_amd64.deb \ - teamviewer13.deb \ - no -} - -# -# install Teamviewer 13 (Menu) -# -function installTeamViewer13Menu () { - installPackageDpkg https://download.teamviewer.com/download/linux/teamviewer_amd64.deb \ - teamviewer13.deb \ - yes -} - -# -# Boostnotes (headless) -# -function installBoostnotes () { - installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ - boostnotes.deb \ - no -} - -# -# Boostnotes (Menu) -# -function installBoostnotesMenu () { - installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ - boostnotes.deb \ - yes -} - -# -# install Compass (headless) -# -function installCompass () { - installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.13.1_amd64.deb \ - compass.deb \ - no -} - -# -# install Compass (Menu) -# -function installCompassMenu () { - installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.13.1_amd64.deb \ - compass.deb \ - yes -} - diff --git a/menus_functions_ub1604.sh b/menus_functions_ub1604.sh deleted file mode 100644 index c96bd0a..0000000 --- a/menus_functions_ub1604.sh +++ /dev/null @@ -1,507 +0,0 @@ -#-----------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : see documentation or man pages # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#-----------------------------------------------------------------------------# - -#-----------------------------------------------------------------------------# -# # -# Ubuntu 16.04 / Linux Mint 18 # -# # -#-----------------------------------------------------------------------------# - -#-----------------------------------------------------------------------------# -# menus functions # -#-----------------------------------------------------------------------------# - -# -# show about dialog box -# -function showAboutBoxMenu () { -whiptail \ ---title "About" \ ---msgbox "\n - Author : Francois B. (Makotosan) - Email : shakasan@sirenacorp.be -Website : https://makotonoblog.be/ - Github : https://github.com/shakasan/yggdrasil_ng -Licence : GPLv3 -Version : $version\n -At the beginning, this script has been written to makes my life easier when I have to (re)install my personal computers ;-) -Advices and remarks are welcome ^^" \ -20 80 -} - -# -# show reboot menu -# -function showRebootBoxMenu () { - if (whiptail \ - --title "Yggdrasil $version - WARNING - ReBoot" \ - --yesno "Are you sure to reboot this computer ?" \ - 7 42) then - sudo reboot - fi -} - -# -# show menu to config system -# -function showConfigMenu () { - while true; do - - configMenuOptions=$(whiptail \ - --title "Yggdrasil $version - System Config" \ - --menu "System Config" \ - 25 80 16 \ - "Ufw" "Enable Firewall (ufw)" \ - "NumLockX" "NumLock Enabled at boot time" \ - "TmpRAM" "/tmp stored in RAM" \ - "screenfetch" "screenfetch added to .bashrc" \ - "historyTS" "TimeStamp enabled in Shell History" \ - "unattendedUpgrades" "Enable automatic security updates" \ - "Unbound" "Enable Unbound DNS Cache server" \ - "Back" "Back" 3>&1 1>&2 2>&3) - - case $configMenuOptions in - "Ufw") - clear - enableUFW - pressKey - ;; - "NumLockX") - clear - enableNumLockX - pressKey - ;; - "TmpRAM") - clear - enableTmpRAM - pressKey - ;; - "screenfetch") - clear - addScreenfetchBashrc - pressKey - ;; - "historyTS") - clear - enableHistoryTS - pressKey - ;; - "unattendedUpgrades") - clear - installUnattendedUpgrades - pressKey - ;; - "Unbound") - clear - installAppsFromList unbound - pressKey - ;; - "Back") - break - ;; - esac - - done -} - -# -# show menu to install system tools -# -function showSysToolsMenu () { - while true; do - - sysToolsMenuOptions=$(whiptail \ - --title "Yggdrasil $version - System Tools" \ - --menu "System tools to diagnose and optimize" \ - 25 80 16 \ - "inxi" "System informations" \ - "speedtest-cli" "Bandwidth test" \ - "packetloss" "Packetloss test (ping)" \ - "OptimizeFirefox" "Firefox SQLite databases optimization" \ - "Autoremove" "Remove useless Deb packages" \ - "CleanOldKernels" "Removing old kernels (keep 2 last kernels)" \ - "SoundCardsDetection" "Sound Cards Detection" \ - "Back" "Back" 3>&1 1>&2 2>&3) - - case $sysToolsMenuOptions in - "inxi") - clear; toolInxi; pressKey - ;; - "speedtest-cli") - clear; toolSpeedtestCli; pressKey - ;; - "packetloss") - clear; toolPacketLoss; pressKey - ;; - "OptimizeFirefox") - clear; toolOptimizeFirefox; pressKey - ;; - "Autoremove") - clear; toolAutoremove; pressKey - ;; - "CleanOldKernels") - clear; toolClearOldKernels; pressKey - ;; - "SoundCardsDetection") - clear; toolSoundCardsDetection; pressKey - ;; - "Back") - break - ;; - esac - - done -} - -# -# show menu to install themes/icons -# -function showThemesInstallMenu () { - while true; do - - themesInstallMenuOptions=$(whiptail \ - --title "Yggdrasil $version - Themes/Icons Install" \ - --menu "Install themes/icons from different submenus" \ - 25 80 16 \ - "themes" "GTK themes" \ - "icons" "Icons" \ - "Back" "Back" 3>&1 1>&2 2>&3) - - case $themesInstallMenuOptions in - "themes") - installAppsFromListMenu gtkthemes - ;; - "icons") - installAppsFromListMenu icons - ;; - "Back") - break - ;; - esac - - done -} - -# -# show menu to install dev apps -# -function showDevInstallMenu () { - while true; do - - devInstallMenuOptions=$(whiptail \ - --title "Yggdrasil $version - Dev Install" \ - --menu "Install Dev apps from different submenus" \ - 25 80 16 \ - "devbase" "dev apps and tools" \ - "java10" "Java 10 dev env" \ - "javascript" "JavaScript dev env" \ - "mongodb3ce" "MongoDB 3 CE" \ - "php" "PHP dev env" \ - "lua" "Lua dev env" \ - "ruby" "Ruby dev env" \ - "qt" "QT dev env" \ - "python" "Python dev env" \ - "atom" "Atom" \ - "anjuta" "Anjuta" \ - "brackets" "Brackets" \ - "codeblocks" "CodeBlocks" \ - "geany" "Geany" \ - "idea" "Idea" \ - "eclipse" "Eclipse" \ - "pycharm" "PyCharm" \ - "vsc" "Visual Studio Code" \ - "androidstudio" "Android Studio" \ - "sublimetext" "Sublime Text" \ - "cad" "CAD tools" \ - "teamviewer13" "Teamviewer 13" \ - "boostnotes" "Boostnotes Markdown wiki app" \ - "compass" "MongoDB Compass GUI" \ - "Back" "Back" 3>&1 1>&2 2>&3) - - case $devInstallMenuOptions in - "devbase") - installAppsFromListMenu dev - ;; - "java10") - installAppsFromListMenu java10 - ;; - "javascript") - installAppsFromListMenu javascript - ;; - "mongodb3ce") - installAppsFromListMenu mongodb - ;; - "php") - installAppsFromListMenu php - ;; - "lua") - installAppsFromListMenu lua - ;; - "ruby") - installAppsFromListMenu ruby - ;; - "qt") - installAppsFromListMenu qt - ;; - "python") - installAppsFromListMenu python - ;; - "atom") - installAppsFromListMenu atom - ;; - "anjuta") - installAppsFromListMenu anjuta - ;; - "brackets") - installAppsFromListMenu brackets - ;; - "codeblocks") - installAppsFromListMenu codeblocks - ;; - "geany") - installAppsFromListMenu geany - ;; - "idea") - installAppsFromListMenu idea - ;; - "eclipse") - installAppsFromListMenu eclipse - ;; - "pycharm") - installAppsFromListMenu pycharm - ;; - "vsc") - installAppsFromListMenu code - ;; - "androidstudio") - installAppsFromListMenu androidstudio - ;; - "sublimetext") - installAppsFromListMenu sublime-text - ;; - "cad") - installAppsFromListMenu cad - ;; - "teamviewer13") - installTeamViewer13Menu - ;; - "boostnotes") - installBoostnotesMenu - ;; - "compass") - installCompassMenu - ;; - "Back") - break - ;; - esac - - done -} - -# -# show menu to install apps from different categories -# -function showAppInstallMenu () { - while true; do - - appsInstallMenuOptions=$(whiptail \ - --title "Yggdrasil $version - Apps Install" \ - --menu "Install apps from different submenus" \ - 25 80 16 \ - "base" "Base Apps" \ - "office" "Office Apps" \ - "multimedia" "Multimedia Apps" \ - "ebook" "eBook Apps" \ - "internet" "Internet Apps" \ - "utilities" "Misc Utilities" \ - "games" "Games & tools" \ - "steam" "Steam" \ - "burningtools" "Disc Burning and tools" \ - "nettools" "Network tools" \ - "cajaplugins" "Caja Plugins" \ - "nautilus" "Nautilus and plugins" \ - "thunar" "Thunar file manager" \ - "gimp" "Gimp plugins" \ - "rhythmbox" "RhythmBox plugins" \ - "pidgin" "Pidgin plugins" \ - "nitrogen" "Nitrogen WP Manager" \ - "wine" "Wine Builds" \ - "viber" "Viber IM desktop app" \ - "franz" "Franz, Multi IM app" \ - "slack" "Slack App" \ - "Back" "Back" 3>&1 1>&2 2>&3) - - case $appsInstallMenuOptions in - "base") - installAppsFromListMenu base - ;; - "office") - installAppsFromListMenu office - ;; - "multimedia") - installAppsFromListMenu multimedia - ;; - "ebook") - installAppsFromListMenu ebook - ;; - "internet") - installAppsFromListMenu internet - ;; - "utilities") - installAppsFromListMenu utilities - ;; - "games") - installAppsFromListMenu games - ;; - "steam") - installAppsFromListMenu steam - ;; - "burningtools") - installAppsFromListMenu burningtools - ;; - "nettools") - installAppsFromListMenu nettools - ;; - "cajaplugins") - installAppsFromListMenu cajaplugins - ;; - "nautilus") - installNautilusAndPluginsMenu - ;; - "thunar") - installAppsFromListMenu thunar - ;; - "gimp") - installAppsFromListMenu gimp - ;; - "rhythmbox") - installAppsFromListMenu rhythmbox - ;; - "pidgin") - installAppsFromListMenu pidgin - ;; - "nitrogen") - installAppsFromListMenu nitrogen - ;; - "wine") - installAppsFromListMenu wine - ;; - "viber") - installViberMenu - ;; - "franz") - installFranzMenu - ;; - "slack") - installSlackMenu - ;; - "Back") - break - ;; - esac - - done -} - -# -# show menu to install beta apps from different categories -# -function showAppBetaInstallMenu () { - installBetaMenu -} - -# -# show menu to install nightly apps from different categories -# -function showAppNightlyInstallMenu () { - installNightlyMenu -} - -# -# show menu about install/config hardware -# -function showHardwareMenu () { - while true; do - - hardwareMenuOptions=$(whiptail \ - --title "Yggdrasil $version - System Tools" \ - --menu "System tools to diagnose and optimize" \ - 25 80 16 \ - "cardreader" "Apps/tools needed for cardreaders" \ - "solaar" "Solaar for Logitech Unifying devices" \ - "webcam" "Install webcam neede apps" \ - "microcode" "Update Intel/AMD CPU microcode" \ - "nvidia370" "Install Nvidia 370 graphic drivers" \ - "nvidia375" "Install Nvidia 375 graphic drivers" \ - "nvidia378" "Install Nvidia 378 graphic drivers" \ - "nvidia381" "Install Nvidia 381 graphic drivers" \ - "nvidia384" "Install Nvidia 384 graphic drivers" \ - "nvidia387" "Install Nvidia 387 graphic drivers" \ - "nvidia390" "Install Nvidia 390 graphic drivers" \ - "nvidia396" "Install Nvidia 396 graphic drivers" \ - "tlp" "Install/Enable TLP for better power management " \ - "keyid" "Add udev rules for Key-ID FIDO U2F usb key" \ - "WI6320" "Fix Intel Wireless 6320 card config problem" \ - "Back" "Back" 3>&1 1>&2 2>&3) - - case $hardwareMenuOptions in - "cardreader") - installAppsFromListMenu cardreader - ;; - "solaar") - installAppsFromListMenu solaar - ;; - "webcam") - installAppsFromListMenu webcam - ;; - "microcode") - updateMicrocode - ;; - "nvidia370") - installAppsFromListMenu nvidia-370 - ;; - "nvidia375") - installAppsFromListMenu nvidia-375 - ;; - "nvidia378") - installAppsFromListMenu nvidia-378 - ;; - "nvidia381") - installAppsFromListMenu nvidia-381 - ;; - "nvidia384") - installAppsFromListMenu nvidia-384 - ;; - "nvidia387") - installAppsFromListMenu nvidia-387 - ;; - "nvidia390") - installAppsFromListMenu nvidia-390 - ;; - "nvidia396") - installAppsFromListMenu nvidia-396 - ;; - "tlp") - installAppsFromListMenu tlp - ;; - "keyid") - installKeyIDuDev - pressKey - ;; - "WI6320") - fixWirelessIntel6320 - pressKey - ;; - "Back") - break - ;; - esac - - done -} diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index f616e8f..0dfeb16 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -441,12 +441,6 @@ function showHardwareMenu () { "solaar" "Solaar for Logitech Unifying devices" \ "webcam" "Install webcam neede apps" \ "microcode" "Update Intel/AMD CPU microcode" \ - "nvidia384" "Install Nvidia 384 graphic drivers" \ - "nvidia387" "Install Nvidia 387 graphic drivers" \ - "nvidia390" "Install Nvidia 390 graphic drivers" \ - "nvidia396" "Install Nvidia 396 graphic drivers" \ - "nvidia410" "Install Nvidia 410 graphic drivers" \ - "nvidia415" "Install Nvidia 415 graphic drivers" \ "tlp" "Install/Enable TLP for better power management " \ "keyid" "Add udev rules for Key-ID FIDO U2F usb key" \ "WI6320" "Fix Intel Wireless 6320 card config problem" \ @@ -465,24 +459,6 @@ function showHardwareMenu () { "microcode") updateMicrocode ;; - "nvidia384") - installAppsFromListMenu nvidia-384 - ;; - "nvidia387") - installAppsFromListMenu nvidia-387 - ;; - "nvidia390") - installAppsFromListMenu nvidia-390 - ;; - "nvidia396") - installAppsFromListMenu nvidia-driver-396 - ;; - "nvidia410") - installAppsFromListMenu nvidia-driver-410 - ;; - "nvidia415") - installAppsFromListMenu nvidia-driver-415 - ;; "tlp") installAppsFromListMenu tlp ;; diff --git a/repo_functions_ub1604.sh b/repo_functions_ub1604.sh deleted file mode 100644 index a3a80cd..0000000 --- a/repo_functions_ub1604.sh +++ /dev/null @@ -1,1422 +0,0 @@ -#-----------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : see documentation or man pages # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#-----------------------------------------------------------------------------# - -#-----------------------------------------------------------------------------# -# # -# Ubuntu 16.04 / Linux Mint 18 # -# # -#-----------------------------------------------------------------------------# - -#-----------------------------------------------------------------------------# -# list of apps with required package manager and category # -#-----------------------------------------------------------------------------# - -# -# List of packages available -# fields : package name, package manager, category, unique ID for external functions -# -Apps="cifs-utils;apt;base;cifs-utils -xterm;apt;base;xterm -curl;apt;base;curl -mc;apt;base;mc -bmon;apt;base;bmon -htop;apt;base;htop -screen;apt;base;screen -dconf-cli;apt;base;dconf -dconf-editor;apt;base;dconf-editor -lnav;apt;base;lnav -exfat-fuse;apt;base;exfat-fuse -exfat-utils;apt;base;exfat-utils -iftop;apt;base;iftop -iptraf;apt;base;iptraf -mpg123;apt;base;mpg123 -debconf-utils;apt;base;debconf-utils -idle3-tools;apt;base;idle3-tools -snapd;apt;base;snapd -sysstat;apt;base;sysstat -spotify;snap;multimedia;spotify -slowmovideo;apt;multimedia;slowmovideo -sayonara;apt;multimedia;sayonara -qmmp;apt;multimedia;qmmp -qmmp-plugin-projectm;apt;multimedia;qmmp-plugin-projectm -shotcut;apt;multimedia;shotcut -audacious;apt;multimedia;audacious -dia;apt;multimedia;dia -mpv;apt;multimedia;mpv -picard;apt;multimedia;picard -inkscape;apt;multimedia;inkscape -aegisub;apt;multimedia;aegisub -aegisub-l10n;apt;multimedia;aegisub-l10n -mypaint;apt;multimedia;mypaint -mypaint-data-extras;apt;multimedia;mypaint-data-extras -audacity;apt;multimedia;audacity -blender;apt;multimedia;blender -kodi;apt;multimedia;kodi -digikam;apt;multimedia;digikam -synfigstudio;apt;multimedia;synfigstudio -mkvtoolnix-gui;apt;multimedia;mkvtoolnix-gui -rawtherapee;apt;multimedia;rawtherapee -hugin;apt;multimedia;hugin -asunder;apt;multimedia;asunder -milkytracker;apt;multimedia;milkytracker -pitivi;apt;multimedia;pitivi -openshot;apt;multimedia;openshot -smplayer;apt;multimedia;smplayer -smplayer-themes;apt;multimedia;smplayer-themes -smplayer-l10n;apt;multimedia;smplayer-l10n -selene;apt;multimedia;selene -gnome-mplayer;apt;multimedia;gnome-mplayer -handbrake;apt;multimedia;handbrake -avidemux2.6-qt;apt;multimedia;avidemux2.6-qt -avidemux2.6-plugins-qt;apt;multimedia;avidemux2.6-plugins-qt -mjpegtools;apt;multimedia;mjpegtools -twolame;apt;multimedia;twolame -lame;apt;multimedia;lame -banshee;apt;multimedia;banshee -banshee-extension-soundmenu;apt;multimedia;banshee-extension-soundmenu -gpicview;apt;multimedia;gpicview -vlc;apt;multimedia;vlc -shotwell;apt;multimedia;shotwell -darktable;apt;multimedia;darktable -ffmpeg;apt;multimedia;ffmpeg -flacon;apt;multimedia;flacon -scribus;apt;multimedia;scribus -gnome-font-viewer;apt;multimedia;gnome-font-viewer -moc;apt;multimedia;moc -webp;apt;multimedia;webp -simplescreenrecorder;apt;multimedia;simplescreenrecorder -simplescreenrecorder-lib;apt;multimedia;simplescreenrecorder-lib -simplescreenrecorder-lib:i386;apt;multimedia;simplescreenrecorder-lib:i386 -cuetools;apt;multimedia;cuetools -shntool;apt;multimedia;shntool -flac;apt;multimedia;flac -entangle;apt;multimedia;entangle -krita;apt;multimedia;krita -soundconverter;apt;multimedia;soundconverter -gimp;apt;multimedia;gimp -gcolor2;apt;multimedia;gcolor2 -vidcutter;apt;multimedia;vidcutter -green-recorder;apt;multimedia;green-recorder -radiotray;apt;multimedia;radiotray -quodlibet;apt;multimedia;quodlibet -python-cddb;apt;multimedia;python-cddb -python-musicbrainz2;apt;multimedia;python-musicbrainz2 -gmusicbrowser;apt;multimedia;gmusicbrowser -peek;apt;multimedia;peek -bino;apt;multimedia;bino -syncthing-gtk;apt;internet;syncthing-gtk -syncthing;apt;internet;syncthing -insync;apt;internet;insync -discord;snap;internet;discord -quiterss;apt;internet;quiterss -opera-stable;apt;internet;opera-stable -google-chrome-stable;apt;internet;google-chrome-stable -xchat-gnome;apt;internet;xchat-gnome -xchat-gnome-indicator;apt;internet;xchat-gnome-indicator -chromium-browser;apt;internet;chromium-browser -chromium-browser-l10n;apt;internet;chromium-browser-l10n -nautilus-dropbox;apt;internet;nautilus-dropbox -filezilla;apt;internet;filezilla -hexchat;apt;internet;hexchat -mumble;apt;internet;mumble -imagedownloader;apt;internet;imagedownloader -california;apt;internet;california -midori;apt;internet;midori -geary;apt;internet;geary -corebird;apt;internet;corebird -telegram;apt;internet;telegram -skypeforlinux;apt;internet;skypeforlinux -nextcloud-client;apt;internet;nextcloud-client -deluge-gtk;apt;internet;deluge-gtk -deluge-torrent;apt;internet;deluge-torrent -vivaldi-stable;apt;internet;vivaldi-stable -transmission-gtk;apt;internet;transmission-gtk -iridium-browser;apt;internet;iridiumbrowser -qtqr;apt;utilities;qtqr -gqrcode;apt;utilities;gqrcode -cpu-g;apt;utilities;cpu-g -screenfetch;apt;utilities;screenfetch -xcalib;apt;utilities;xcalib -conky-manager;apt;utilities;conky-manager -conky-all;apt;utilities;conky-all -plank;apt;utilities;plank -indicator-sound-switcher;apt;utilities;indicator-sound-switcher -y-ppa-manager;apt;utilities;y-ppa-manager -synapse;apt;utilities;synapse -acetoneiso;apt;utilities;acetoneiso -guake;apt;utilities;guake -tilda;apt;utilities;tilda -psensor;apt;utilities;psensor -kazam;apt;utilities;kazam -bleachbit;apt;utilities;bleachbit -gparted;apt;utilities;gparted -gsmartcontrol;apt;utilities;gsmartcontrol -terminator;apt;utilities;terminator -aptik;apt;utilities;aptik -gufw;apt;utilities;gufw -numlockx;apt;utilities;numlockx -grub-customizer;apt;utilities;grub-customizer -unetbootin;apt;utilities;unebootin -zim;apt;utilities;zim -diodon;apt;utilities;diodon -pyrenamer;apt;utilities;pyrenamer -qt5ct;apt;utilities;qt5ct -qt4-qtconfig;apt;utilities;qt4-qtconfig -byobu;apt;utilities;byobu -mupdf;apt;utilities;mupdf -mupdf-tools;apt;utilities;mupdf-tools -ukuu;apt;utilities;ukuu -fcrackzip;apt;utilities;fcrackzip -rarcrack;apt;utilities;rarcrack -pdfcrack;apt;utilities;pdfcrack -figlet;apt;utilities;figlet -alltray;apt;utilities;alltray -cheat;pip;utilities;cheat -mate-sensors-applet-nvidia;apt;utilities;mate-sensors-applets-nvidia -woeusb;apt;utilities;woeusb -screenkey;apt;utilities;screenkey -tmsu;apt;utilities;tmsu -pdfgrep;apt;utilities;pdfgrep -coinmon;npm;utilities;coinmon -tldr;pip;utilities;tldr -gyazo;apt;utilities;gyazo -fdupes;apt;utilities;fdupes -vulkan-utils;apt;utilities;vulkan-utils -python3-dev;apt;python;python3-dev -python3-pip;apt;python;python3-pip -python3-pyqt5;apt;python;python3-pyqt5 -pyqt5-dev-tools;apt;python;pyqt5-dev-tools -pip;pip;python;setuptools -setuptools;pip;python;setuptools -PyOpenGL;pip;python;PyOpenGL -tweepy;pip;python;tweepy -weppy;pip;python;weppy -py-term;pip;python;py-term -jstest-gtk;apt;games;jstest-gtk -dosbox;apt;games;dosbox -steam;apt;steam;steam -brasero;apt;burningtools;brasero -k3b;apt;burningtools;k3b -k3b-extrathemes;apt;burningtools;k3b-extrathemes -xfburn;apt;burningtools;xfburn -whois;apt;nettools;whois -iptraf;apt;nettools;iptraf -iperf;apt;nettools;iperf -wireshark;apt;nettools;wireshark -tshark;apt;nettools;tshark -zenmap;apt;nettools;zenmap -dsniff;apt;nettools;dsniff -aircrack-ng;apt;nettools;aricrack-ng -SpoofMAC;pip;nettools;SpoofMAC -speedtest-cli;pip;nettools;speedtest-cli -whatportis;pip;nettools;whatportis -nethogs;apt;nettools;nethogs -ssh_scan;gem;nettools;sshscan -whatismyip;npm;nettools;whatismyip -caja-share;apt;cajaplugins;caja-share -caja-wallpaper;apt;cajaplugins;caja-wallpaper -caja-sendto;apt;cajaplugins;caka-sendto -caja-image-converter;apt;cajaplugins;caja-image-converter -insync-caja;apt;cajaplugins;insync-caja -nextcloud-client-caja;apt;cajaplugins;nextcloud-client-caja -nautilus;apt;nautilus;nautilus -file-roller;apt;nautilus;file-roller -nautilus-terminal;apt;nautilus;nautilus-terminal -nautilus-emblems;apt;nautilus;nautilus-emblems -nautilus-image-manipulator;apt;nautilus;nautilus-image-manipulator -nautilus-image-converter;apt;nautilus;nautilus-image-converter -nautilus-compare;apt;nautilus;nautilus-compare -nautilus-actions;apt;nautilus;nautilus-actions -nautilus-sendto;apt;nautilus;nautilus-sendto -nautilus-share;apt;nautilus;nautilus-share -nautilus-wipe;apt;nautilus;nautilus-wipe -nautilus-script-audio-convert;apt;nautilus;nautilus-script-audio-convert -nautilus-filename-repairer;apt;nautilus;filename-repairer -nautilus-gtkhash;apt;nautilus;nautilus-gtkhash -nautilus-ideviceinfo;apt;nautilus;nautilus-ideviceinfo -ooo-thumbnailer;apt;nautilus;ooo-thumbnailer -nautilus-dropbox;apt;nautilus;nautilus-dropbox -nautilus-script-manager;apt;nautilus;nautilus-script-manager -nautilus-columns;apt;nautilus;nautilus-columns -insync-nautilus;apt;nautilus;insync-nautilus -thunar;apt;thunar;thunar -thunar-archive-plugin;apt;thunar;thunar-archive-plugin -thunar-gtkhash;apt;thunar;thunar-gtkhash -thunar-volman;apt;thunar;thunar-volman -gtkam-gimp;apt;gimp;gtkam-gimp -gimp-gluas;apt;gimp;gimp-gluas -pandora;apt;gimp;pandora -gimp-data-extras;apt;gimp;gimp-data-extras -gimp-lensfun;apt;gimp;gimp-lensfun -gimp-gmic;apt;gimp;gimp-gmic -gimp-ufraw;apt;gimp;gimp-ufraw -gimp-texturize;apt;gimp;gimp-texturize -gimp-plugin-registry;apt;gimp;gimp-plugin-registry -rhythmbox-plugin-alternative-toolbar;apt;rhythmbox;rhythmbox-plugin-alternative-toolbar -rhythmbox-plugin-artdisplay;apt;rhythmbox;rhythmbox-plugin-artdisplay -rhythmbox-plugin-cdrecorder;apt;rhythmbox;rhythmbox-plugin-cdrecorder -rhythmbox-plugin-close-on-hide;apt;rhythmbox;rhythmbox-plugin-close-on-hide -rhythmbox-plugin-countdown-playlist;apt;rhythmbox;rhythmbox-plugin-countdown-playlist -rhythmbox-plugin-coverart-browser;apt;rhythmbox;rhythmbox-plugin-coverart-browser -rhythmbox-plugin-coverart-search;apt;rhythmbox;rhythmbox-pluginn-coverart-search -rhythmbox-plugin-desktopart;apt;rhythmbox;rhythmbox-plugin-desktopart -rhythmbox-plugin-equalizer;apt;rhythmbox;rhythmbox-plugin-equalizer -rhythmbox-plugin-fileorganizer;apt;rhythmbox;rhythmbox-plugin-fileorganizer -rhythmbox-plugin-fullscreen;apt;rhythmbox;rhythmbox-plugin-fullscreen -rhythmbox-plugin-hide;apt;rhythmbox;rhythmbox-plugin-hide -rhythmbox-plugin-jumptowindow;apt;rhythmbox;rhythmbox-plugin-jumptowindow -rhythmbox-plugin-llyrics;apt;rhythmbox;rhythmbox-plugin-llyrics -rhythmbox-plugin-looper;apt;rhythmbox;rhythmbox-plugin-looper -rhythmbox-plugin-opencontainingfolder;apt;rhythmbox;rhythmbox-plugin-opencontainingfolder -rhythmbox-plugin-parametriceq;apt;rhythmbox;rhythmbox-plugin-parametriceq -rhythmbox-plugin-playlist-import-export;apt;rhythmbox;rhythmbox-plugin-playlist -rhythmbox-plugin-podcast-pos;apt;rhythmbox;rhythmbox-plugin-podcast-pos -rhythmbox-plugin-randomalbumplayer;apt;rhythmbox;rhythmbox-plugin-randomalbumplayer -rhythmbox-plugin-rating-filters;apt;rhythmbox;rhythmbox-plugin-rating-filters -rhythmbox-plugin-remembertherhythm;apt;rhythmbox;rhythmbox-plugin-remembertherhythm -rhythmbox-plugin-repeat-one-song;apt;rhythmbox;rhythmbox-plugin-repeat-one-song -rhythmbox-plugin-rhythmweb;apt;rhythmbox;rhythmbox-plugin-rhythmweb -rhythmbox-plugin-screensaver;apt;rhythmbox;rhythmbox-plugin-screensaver -rhythmbox-plugin-smallwindow;apt;rhythmbox;rhythmbox-plugin-smallwindow -rhythmbox-plugin-spectrum;apt;rhythmbox;rhythmbox-plugin-spectrum -rhythmbox-plugin-suspend;apt;rhythmbox;rhythmbox-plugin-suspend -rhythmbox-plugin-tray-icon;apt;rhythmbox;rhythmbox-plugin-tray-icon -rhythmbox-plugin-visualizer;apt;rhythmbox;rhythmbox-plugin-visualizer -rhythmbox-plugin-wikipedia;apt;rhythmbox;rhythmbox-plugin-wikipedia -rhythmbox-plugins;apt;rhythmbox;rhythmbox-plugins -telegram-purple;apt;pidgin;telegram-purple -pidgin-skype;apt;pidgin;pidgin-skype -purple-facebook;apt;pidgin;purple-facebook -purple-hangouts;apt;pidgin;purple-hangouts -pidgin-hangouts;apt;pidgin;pidgin-hangouts -pidgin-skypeweb;apt;pidgin;pidgin-skypeweb -purple-skypeweb;apt;pidgin;purple-skypeweb -unbound;apt;unbound;unbound -ambiance-crunchy;apt;gtkthemes;ambiance-crunchy -arc-theme;apt;gtkthemes;arc-theme -ambiance-colors;apt;gtkthemes;ambiance-colors -radiance-colors;apt;gtkthemes;radiance-colors -ambiance-flat-colors;apt;gtkthemes;ambiance-flat-colors -vivacious-colors-gtk-dark;apt;gtkthemes;vivacious-colors-gtk-dark -vivacious-colors-gtk-light;apt;gtkthemes;vivacious-colors-gtk-light -yosembiance-gtk-theme;apt;gtkthemes;yosembiance-gtk-theme -ambiance-blackout-colors;apt;gtkthemes;ambiance-blackout-colors -ambiance-blackout-flat-colors;apt;gtkthemes;ambiance-blackout-flat-colors -radiance-flat-colors;apt;gtkthemes;radiance-flat-colors -vibrancy-colors;apt;gtkthemes;vibrancy-colors -vivacious-colors;apt;gtkthemes;vivacious-colors -numix-gtk-theme;apt;gtkthemes;numix-gtk-theme -arc-icons;apt;icons;arc-icons -ultra-flat-icons;apt;icons;ultra-flat-icons -myelementary;apt;icons;myelementary -ghost-flat-icons;apt;icons;ghost-flat-icons -faenza-icon-theme;apt;icons;faenza-icon-theme -faience-icon-theme;apt;icons;faience-icon-theme -vibrantly-simple-icon-theme;apt;icons;vibrantly-simple-icon-theme -rave-x-colors-icons;apt;icons;rave-x-colors-icons -ravefinity-x-icons;apt;icons;ravefinity-x-icons -numix-icon-theme;apt;icons;numix-icon-theme -numix-icon-theme-circle;apt;icons;numix-icon-theme-circle -solaar;apt;solaar;solaar -pcscd;apt;cardreader;pcscd -pcsc-tools;apt;cardreader;pcsc-tools -libacr38u;apt;cardreader;libacr38u -guvcview;apt;webcam;guvcview -cheese;apt;webcam;cheese -nvidia-370;apt;nvidia-370;nvidia-370 -nvidia-settings;apt;nvidia-370;nvidia-settings -nvidia-opencl-icd-370;apt;nvidia-370;nvidia-opencl-icd-370 -nvidia-375;apt;nvidia-375;nvidia-375 -nvidia-settings;apt;nvidia-375;nvidia-settings -nvidia-opencl-icd-375;apt;nvidia-375;nvidia-opencl-icd-375 -nvidia-378;apt;nvidia-378;nvidia-378 -nvidia-settings;apt;nvidia-378;nvidia-settings -nvidia-opencl-icd-378;apt;nvidia-378;nvidia-opencl-icd-378 -libcuda1-378;apt;nvidia-378;libcuda1-378 -nvidia-381;apt;nvidia-381;nvidia-381 -nvidia-settings;apt;nvidia-381;nvidia-settings -nvidia-opencl-icd-381;apt;nvidia-381;nvidia-opencl-icd-381 -libcuda1-381;apt;nvidia-381;libcuda1-381 -nvidia-384;apt;nvidia-384;nvidia-384 -nvidia-settings;apt;nvidia-384;nvidia-settings -nvidia-opencl-icd-384;apt;nvidia-384;nvidia-opencl-icd-384 -libcuda1-384;apt;nvidia-384;libcuda1-384 -nvidia-387;apt;nvidia-387;nvidia-387 -nvidia-settings;apt;nvidia-387;nvidia-settings -nvidia-opencl-icd-387;apt;nvidia-387;nvidia-opencl-icd-387 -libcuda1-387;apt;nvidia-387;libcuda1-387 -nvidia-390;apt;nvidia-390;nvidia-390 -nvidia-settings;apt;nvidia-390;nvidia-settings -nvidia-opencl-icd-390;apt;nvidia-390;nvidia-opencl-icd-390 -libcuda1-390;apt;nvidia-390;libcuda1-390 -nvidia-396;apt;nvidia-396;nvidia-396 -nvidia-settings;apt;nvidia-396;nvidia-settings -nvidia-opencl-icd-396;apt;nvidia-396;nvidia-opencl-icd-396 -libcuda1-396;apt;nvidia-396;libcuda1-396 -tlp;apt;tlp;tlp -notepadqq;apt;dev;notepadqq -agave;apt;dev;agave -utext;apt;dev;utext -gpick;apt;dev;gpick -virtualbox-5.2;apt;dev;virtualbox-5.2 -build-essential;apt;dev;build-essential -ubuntu-make;apt;dev;ubuntu-make -ghex;apt;dev;ghex -glade;apt;dev;glade -eric;apt;dev;eric -bluefish;apt;dev;bluefish -meld;apt;dev;meld -zeal;apt;dev;zeal -shellcheck;apt;dev;shellcheck -umbrello;apt;dev;umbrello -ack-grep;apt;dev;ack-grep -ansible;apt;dev;ansible -docker-ce;apt;dev;docker-ce -remark-lint;npm;dev;remark-lint -beautysh;pip;dev;beautysh -mycli;pip;dev;mycli -sqlitebrowser;apt;dev;sqlitebrowser -mysql-workbench;apt;dev;mysql-workbench -jq;apt;dev;jq -nodejs;apt;javascript;nodejs8lts -javascript-common;apt;javascript;javascript-common -yarn;npm;javascript;yarn -emma-cli;npm;javascript;emma-cli -jshint;npm;javascript;jshint -typescript;npm;javascript;typescript -@angular/cli;npm;javascript;angularcli -ionic;npm;javascript;ionic -cordova;npm;javascript;cordova -eslint;npm;javascript;eslint -web-ext;npm;javascript;web-ext -oracle-java10-installer;apt;java10;oracle-java10-installer -oracle-java10-set-default;apt;java10;oracle-java10-set-default -php7.0-cli;apt;php;php7.0-cli -php-pear;apt;php;php-pear -composer;apt;php;composer -luajit;apt;lua;luajit -ruby-dev;apt;ruby;ruby-dev -ruby-full;apt;ruby;ruby-full -ruby-rainbow;apt;ruby;ruby-rainbow -anjuta;apt;anjuta;anjuta -anjuta-extras;apt;anjuta;anjuta-extras -brackets;apt;brackets;brackets -codeblocks;apt;codeblocks;codeblocks -codeblocks-contrib;apt;codeblocks;codeblocks-contrib -geany;apt;geany;geany -geany-plugins;apt;geany;geany-plugins -geany-plugin-markdown;apt;geany;geany-plugin-markdown -pycharm-community;snap;pycharm;pycharm -sublime-text;apt;sublime-text;sublime-text -kicad;apt;cad;kicad -kicad-locale-fr;apt;cad;kicad-locale-fr -librecad;apt;cad;librecad -freecad;apt;cad;freecad -code;apt;code;code -atom;apt;atom;atom -sqlparse;pip;atom;sqlparse -flake8;pip;atom;flake8 -autopep8;pip;atom;autopep8 -htmlbeautifier;gem;atom;htmlbeautifier -kodi;apt;beta;kodi-beta -kodi;apt;nightly;kodi-nightly -nitrogen;apt;nitrogen;nitrogen -firefox-trunk;apt;nightly;firefox-trunk -firefox-trunk-locale-fr;apt;nightly;firefox-trunk-locale-fr -libreoffice;apt;office;libreoffice6 -winehq-devel;apt;wine;winehq-devel -winetricks;apt;wine;winetricks -playonlinux;apt;wine;playonlinux -mongodb-org;apt;mongodb;mongodb -qt4-dev-tools;apt;qt;qt4-dev-tools -qt4-linguist-tools;apt;qt;qt4-linguist-tools -qt5-doc;apt;qt;qt5-doc -qttools5-doc;apt;qt;qttools5-doc -qttools5-dev-tools;apt;qt;qttools5-dev-tools -qttools5-examples;apt;qt;qttools5-examples -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 -eclipse;snap;eclipse;eclipse" - -#-----------------------------------------------------------------------------# -# Specific Repo list and functions # -#-----------------------------------------------------------------------------# - -# -# list of specific repositories -# fields : unique ID, function to add repo -# -AppsRepo="kodi-beta;addRepo_KodiBeta -kodi-nightly;addRepo_KodiNightly -libreoffice6;addRepo_Libreoffice6 -winehq-devel;addRepo_Wine -mongodb;addRepo_MongoDB3CE -gyazo;addRepo_Gyazo -code;addRepo_VSCode -androidstudio;addRepo_AndroidStudio -docker-ce;addRepo_DockerCE -ansible;addRepo_Ansible -sublime-text;addRepo_SublimeText -vivaldi-stable;addRepo_Vivaldi -virtualbox-5.2;addRepo_VirtualBox -syncthing;addRepo_Syncthing -opera-stable;addRepo_Opera -insync;addRepo_Insync -google-chrome-stable;addRepo_ChromeStable -atom;addRepo_Atom -nextcloud-client;addRepo_NextCloud -wireshark;addRepo_WireShark -darktable;addRepo_DarkTable -brackets;addRepo_Brackets -kicad;addRepo_Kicad -nodejs8lts;addRepo_NodeLts8 -telegram;addRepo_Telegram -skypeforlinux;addRepo_SkypeForLinux -shotwell;addRepo_Shotwell -peek;addRepo_Peek -sqlitebrowser;addRepo_SQLiteBrowser -ukuu;addRepo_Teejee2008 -aptik;addRepo_Teejee2008 -conky-manager;addRepo_Teejee2008 -selene;addRepo_Teejee2008 -avidemux2.6-plugins-qt;addRepo_Avidemux2.6 -avidemux2.6-qt;addRepo_Avidemux2.6 -tmsu;addRepo_Tmsu -quiterss;addRepo_Quiterss -transmission-gtk;addRepo_Transmissionbt -handbrake;addRepo_Handbrake -notepadqq;addRepo_Notepadqq -mumble;addRepo_Mumble -utext;addRepo_Utext -flacon;addRepo_Flacon -y-ppa-manager;addRepo_YPPAManager -shotcut;addRepo_Shotcut -diodon;addRepo_Diodon -sayonara;addRepo_Sayonara -zeal;addRepo_Zeal -corebird;addRepo_Corebird -deluge-torrent;addRepo_Deluge -deluge-gtk;addRepo_Deluge -kodi;addRepo_Kodi -indicator-sound-switcher;addRepo_IndicatorSoundSwitcher -krita;addRepo_Krita -gimp-gmic;addRepo_Gimp -gimp;addRepo_Gimp -geary;addRepo_Geary -vidcutter;addRepo_Vidcutter -ambiance-crunchy;addRepo_NoobslabThemes -arc-theme;addRepo_NoobslabThemes -ambiance-colors;addRepo_Ravefinity -radiance-colors;addRepo_Ravefinity -ambiance-flat-colors;addRepo_Ravefinity -vivacious-colors-gtk-dark;addRepo_Ravefinity -vivacious-colors-gtk-light;addRepo_Ravefinity -yosembiance-gtk-theme;addRepo_NoobslabThemes -ambiance-blackout-colors;addRepo_Ravefinity -ambiance-blackout-flat-colors;addRepo_Ravefinity -radiance-flat-colors;addRepo_Ravefinity -vibrancy-colors;addRepo_Ravefinity -vivacious-colors;addRepo_NoobslabThemes -arc-icons;addRepo_NoobslabIcons -ultra-flat-icons;addRepo_NoobslabIcons -myelementary;addRepo_NoobslabIcons -ghost-flat-icons;addRepo_NoobslabIcons -faenza-icon-theme;addRepo_NoobslabIcons -vibrantly-simple-icon-theme;addRepo_Ravefinity -rave-x-colors-icons;addRepo_Ravefinity -ravefinity-x-icons;addRepo_Ravefinity -oracle-java10-installer;addRepo_Java10 -oracle-java10-set-default;addRepo_Java10 -green-recorder;addRepo_GreenRecorder -hugin;addRepo_Hugin -simplescreenrecorder;addRepo_SimpleScreenRecorder -simplescreenrecorder-lib;addRepo_SimpleScreenRecorder -simplescreenrecorder-lib:i386;addRepo_SimpleScreenRecorder -slowmovideo;addRepo_Slowmovideo -zim;addRepo_Zim -grub-customizer;addRepo_GrubCustomizer -vlc;addRepo_VLC -numix-gtk-theme;addRepo_Numix -numix-icon-theme;addRepo_Numix -numix-icon-theme-circle;addRepo_Numix -rhythmbox-plugin-alternative-toolbar;addRepo_Rhythmbox -rhythmbox-plugin-artdisplay;addRepo_Rhythmbox -rhythmbox-plugin-cdrecorder;addRepo_Rhythmbox -rhythmbox-plugin-close-on-hide;addRepo_Rhythmbox -rhythmbox-plugin-countdown-playlist;addRepo_Rhythmbox -rhythmbox-plugin-coverart-browser;addRepo_Rhythmbox -rhythmbox-plugin-coverart-search;addRepo_Rhythmbox -rhythmbox-plugin-desktopart;addRepo_Rhythmbox -rhythmbox-plugin-equalizer;addRepo_Rhythmbox -rhythmbox-plugin-fileorganizer;addRepo_Rhythmbox -rhythmbox-plugin-fullscreen;addRepo_Rhythmbox -rhythmbox-plugin-hide;addRepo_Rhythmbox -rhythmbox-plugin-jumptowindow;addRepo_Rhythmbox -rhythmbox-plugin-llyrics;addRepo_Rhythmbox -rhythmbox-plugin-looper;addRepo_Rhythmbox -rhythmbox-plugin-opencontainingfolder;addRepo_Rhythmbox -rhythmbox-plugin-parametriceq;addRepo_Rhythmbox -rhythmbox-plugin-playlist-import-export;addRepo_Rhythmbox -rhythmbox-plugin-podcast-pos;addRepo_Rhythmbox -rhythmbox-plugin-randomalbumplayer;addRepo_Rhythmbox -rhythmbox-plugin-rating-filters;addRepo_Rhythmbox -rhythmbox-plugin-remembertherhythm;addRepo_Rhythmbox -rhythmbox-plugin-repeat-one-song;addRepo_Rhythmbox -rhythmbox-plugin-rhythmweb;addRepo_Rhythmbox -rhythmbox-plugin-screensaver;addRepo_Rhythmbox -rhythmbox-plugin-smallwindow;addRepo_Rhythmbox -rhythmbox-plugin-spectrum;addRepo_Rhythmbox -rhythmbox-plugin-suspend;addRepo_Rhythmbox -rhythmbox-plugin-tray-icon;addRepo_Rhythmbox -rhythmbox-plugin-visualizer;addRepo_Rhythmbox -rhythmbox-plugin-wikipedia;addRepo_Rhythmbox -rhythmbox-plugins;addRepo_Rhythmbox -vulkan-utils;addRepo_NvidiaDrivers -nvidia-settings;addRepo_NvidiaDrivers -nvidia-370;addRepo_NvidiaDrivers -nvidia-opencl-icd-370;addRepo_NvidiaDrivers -nvidia-375;addRepo_NvidiaDrivers -nvidia-opencl-icd-375;addRepo_NvidiaDrivers -nvidia-378;addRepo_NvidiaDrivers -nvidia-opencl-icd-378;addRepo_NvidiaDrivers -libcuda1-378;addRepo_NvidiaDrivers -nvidia-381;addRepo_NvidiaDrivers -nvidia-opencl-icd-381;addRepo_NvidiaDrivers -libcuda1-381;addRepo_NvidiaDrivers -nvidia-384;addRepo_NvidiaDrivers -nvidia-opencl-icd-384;addRepo_NvidiaDrivers -libcuda1-384;addRepo_NvidiaDrivers -nvidia-387;addRepo_NvidiaDrivers -nvidia-opencl-icd-387;addRepo_NvidiaDrivers -libcuda1-387;addRepo_NvidiaDrivers -nvidia-390;addRepo_NvidiaDrivers -nvidia-opencl-icd-390;addRepo_NvidiaDrivers -libcuda1-390;addRepo_NvidiaDrivers -nvidia-396;addRepo_NvidiaDrivers -nvidia-opencl-icd-396;addRepo_NvidiaDrivers -libcuda1-396;addRepo_NvidiaDrivers -rawtherapee;addRepo_DhorMyWay -entangle;addRepo_DhorMyWay -mkvtoolnix-gui;addRepo_MKVToolnix -purple-facebook;addRepo_Jgeboski -cpu-g;addRepo_Atareao -gqrcode;addRepo_Atareao -imagedownloader;addRepo_Atareao -audacious;addRepo_Webupd8 -nautilus-columns;addRepo_Webupd8 -nautilus-terminal;addRepo_Webupd8 -purple-hangouts;addRepo_Webupd8 -purple-skypeweb;addRepo_Webupd8 -pidgin-hangouts;addRepo_Webupd8 -pidgin-skypeweb;addRepo_Webupd8 -qt5ct;addRepo_Webupd8 -syncthing-gtk;addRepo_Webupd8 -telegram-purple;addRepo_Webupd8 -screenkey;addRepo_Webupd8 -yad;addRepo_Webupd8 -woeusb;addRepo_Webupd8 -iridiumbrowser;addRepo_Iridium -picard;addRepo_Picard" - -# -# Makoto no blog repo -# -function addRepo_Makoto () { - addKey "https://packagecloud.io/makoto/stable/gpgkey" - addRepo makoto.list \ - "deb https://packagecloud.io/makoto/stable/ubuntu/ xenial main" -} - -# -# MusicBrainz Picard -# -function addRepo_Picard () { - addPPA ppa:musicbrainz-developers/stable -} - -# -# Iridium-Browser -# -function addRepo_Iridium () { - addKey "https://downloads.iridiumbrowser.de/ubuntu/iridium-release-sign-01.pub" - addRepo iridium-browser.list \ - "deb [arch=amd64] https://downloads.iridiumbrowser.de/deb/ stable main" \ - "deb-src https://downloads.iridiumbrowser.de/deb/ stable main" -} - -# -# Audacious, Guake -# -function addRepo_Webupd8 () { - addPPA ppa:nilarimogard/webupd8 -} - -# -# cpu-g, gqrcode, imagedownloader -# -function addRepo_Atareao () { - addPPA ppa:atareao/atareao -} - -# -# purple facebook -# -function addRepo_Jgeboski () { - addKey "https://jgeboski.github.io/obs.key" - addRepo jgeboski.list \ - "deb http://download.opensuse.org/repositories/home:/jgeboski/xUbuntu_16.04/ ./" -} - -# -# MKVToolnix -# -function addRepo_MKVToolnix () { - addKey "https://mkvtoolnix.download/gpg-pub-moritzbunkus.txt" - addRepo mkv.list \ - "deb https://mkvtoolnix.download/ubuntu/ xenial main" \ - "deb-src https://mkvtoolnix.download/ubuntu/ xenial main" -} - -# -# Entangle, Rawtherapee -# -function addRepo_DhorMyWay () { - addPPA ppa:dhor/myway -} - -# -# Nvidia drivers -# -function addRepo_NvidiaDrivers () { - addPPA ppa:graphics-drivers/ppa -} - -# -# Rhythmbox -# -function addRepo_Rhythmbox () { - addPPA ppa:fossfreedom/rhythmbox - addPPA ppa:fossfreedom/rhythmbox-plugins -} - -# -# Numix themes/icons -# -function addRepo_Numix () { - addPPA ppa:numix/ppa -} - -# -# ravefinity themes -# -function addRepo_Ravefinity () { - addPPA ppa:ravefinity-project/ppa -} - -# -# VLC -# -function addRepo_VLC () { - addPPA ppa:videolan/stable-daily -} - -# -# Grub-Customizer -# -function addRepo_GrubCustomizer () { - addPPA ppa:danielrichter2007/grub-customizer -} - -# -# Zim -# -function addRepo_Zim () { - addPPA ppa:jaap.karssenberg/zim -} - -# -# Slowmovideo -# -function addRepo_Slowmovideo () { - addPPA ppa:ubuntuhandbook1/slowmovideo -} - -# -# Simple-Screen-Recorder -# -function addRepo_SimpleScreenRecorder () { - addPPA ppa:maarten-baert/simplescreenrecorder -} - -# -# Hugin -# -function addRepo_Hugin () { - addPPA ppa:hugin/hugin-builds -} - -# -# Green-Recorder -# -function addRepo_GreenRecorder () { - addPPA ppa:fossproject/ppa -} - -# -# Oracle JAVA 10 -# -function addRepo_Java10 () { - addPPA ppa:linuxuprising/java -} - -# -# Noobslab icons -# -function addRepo_NoobslabIcons () { - addPPA ppa:noobslab/icons -} - -# -# Noobslab themes -# -function addRepo_NoobslabThemes () { - addPPA ppa:noobslab/themes -} - -# -# Vidcutter -# -function addRepo_Vidcutter () { - addPPA ppa:ozmartian/apps -} - - -# -# Geary -# -function addRepo_Geary () { - addPPA ppa:geary-team/releases -} - -# -# Gimp / Gmic -# -function addRepo_Gimp () { - addPPA ppa:otto-kesselgulasch/gimp -} - -# -# Krita -# -function addRepo_Krita () { - addPPA ppa:kritalime/ppa -} - -# -# indicator-sound-switcher -# -function addRepo_IndicatorSoundSwitcher () { - addPPA ppa:yktooo/ppa -} - -# -# Kodi / XBMC -# -function addRepo_Kodi () { - addPPA ppa:team-xbmc/ppa -} - -# -# Deluge -# -function addRepo_Deluge () { - addPPA ppa:deluge-team/ppa -} - -# -# Corebird -# -function addRepo_Corebird () { - addPPA ppa:ubuntuhandbook1/corebird -} - -# -# Zeal -# -function addRepo_Zeal () { - addPPA ppa:zeal-developers/ppa -} - -# -# Sayonara -# -function addRepo_Sayonara () { - addPPA ppa:lucioc/sayonara -} - -# -# Diodon -# -function addRepo_Diodon () { - addPPA ppa:diodon-team/stable -} - -# -# Shotcut -# -function addRepo_Shotcut () { - addPPA ppa:haraldhv/shotcut -} - -# -# Y-PPA-Manager -# -function addRepo_YPPAManager () { - addPPA ppa:webupd8team/y-ppa-manager -} - -# -# flacon -# -function addRepo_Flacon () { - addPPA ppa:flacon/ppa -} - -# -# Utext -# -function addRepo_Utext () { - addPPA ppa:atareao/utext -} - -# -# Mumble -# -function addRepo_Mumble () { - addPPA ppa:mumble/release -} - -# -# Notepadqq -# -function addRepo_Notepadqq () { - addPPA ppa:notepadqq-team/notepadqq -} - -# -# Handbrake -# -function addRepo_Handbrake () { - addPPA ppa:stebbins/handbrake-releases -} - -# -# Transmission-BT -# -function addRepo_Transmissionbt () { - addPPA ppa:transmissionbt/ppa -} - -# -# QuiteRSS -# -function addRepo_Quiterss () { - addPPA ppa:quiterss/quiterss -} - -# -# TMSU -# -function addRepo_Tmsu () { - addPPA ppa:tmsu/ppa -} - -# -# Avidemux -# -function addRepo_Avidemux2.6 () { - addPPA ppa:ubuntuhandbook1/avidemux -} - -# -# aptik, conky-manager, selene, timeshift, ukuu -# -function addRepo_Teejee2008 () { - addPPA ppa:teejee2008/ppa -} - -# -# SQLiteBrowser -# -function addRepo_SQLiteBrowser () { - addPPA ppa:linuxgndu/sqlitebrowser -} - -# -# Peek -# -function addRepo_Peek () { - addPPA ppa:peek-developers/stable -} - -# -# Shotwell -# -function addRepo_Shotwell () { - addPPA ppa:yg-jensge/shotwell -} - -# -# Telegram -# -function addRepo_Telegram () { - addPPA ppa:atareao/telegram -} - -# -# Skype for Linux -# -function addRepo_SkypeForLinux () { - addKey "https://repo.skype.com/data/SKYPE-GPG-KEY" - addRepo "skype-stable.list" \ - "deb [arch=amd64] https://repo.skype.com/deb stable main" -} - -# -# Node 8 LTS -# -function addRepo_NodeLts8 () { - addKey "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" - addRepo "nodesource.list" \ - "deb https://deb.nodesource.com/node_8.x xenial main" \ - "deb-src https://deb.nodesource.com/node_8.x xenial main" -} - -# -# Kicad 4 -# -function addRepo_Kicad () { - addPPA ppa:js-reynaud/kicad-4 -} - -# -# Brackets IDE -# -function addRepo_Brackets () { - addPPA ppa:webupd8team/brackets -} - -# -# Darktable RAW Editor -# -function addRepo_DarkTable () { - addPPA ppa:pmjdebruijn/darktable-release -} - -# -# WireShark -# -function addRepo_WireShark () { -addPPA ppa:wireshark-dev/stable -} - -# -# NextCloud -# -function addRepo_NextCloud () { - addPPA ppa:nextcloud-devs/client -} - -# -# Atom IDE -# -function addRepo_Atom () { - addKey "https://packagecloud.io/AtomEditor/atom/gpgkey" - addRepo atom.list \ - "deb [arch=amd64] https://packagecloud.io/AtomEditor/atom/any/ any main" -} - -# -# Google Chrome (stable) -# -function addRepo_ChromeStable () { - addKey "https://dl.google.com/linux/linux_signing_key.pub" - addRepo google-chrome.list \ - "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" -} - -# -# Insync -# -function addRepo_Insync () { - addKey "https://d2t3ff60b2tol4.cloudfront.net/services@insynchq.com.gpg.key" - addRepo insync.list \ - "deb http://apt.insynchq.com/ubuntu xenial non-free contrib" -} - -# -# Opera (stable) -# -function addRepo_Opera () { - addKey "http://deb.opera.com/archive.key" - addRepo opera.list \ - "deb http://deb.opera.com/opera-stable/ stable non-free" -} - -# -# Syncthing -# -function addRepo_Syncthing () { - addKey "https://syncthing.net/release-key.txt" - addRepo syncthing.list \ - "deb http://apt.syncthing.net/ syncthing release" -} - -# -# VirtualBox -# -function addRepo_VirtualBox () { - addKey "http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc" - addKey "http://download.virtualbox.org/virtualbox/debian/oracle_vbox_2016.asc" - addRepo virtualbox.list \ - "deb http://download.virtualbox.org/virtualbox/debian xenial contrib" -} - -# -# Vivaldi -# -function addRepo_Vivaldi () { - addKey "http://repo.vivaldi.com/stable/linux_signing_key.pub" - addRepo vivaldi.list \ - "deb http://repo.vivaldi.com/stable/deb/ stable main " -} - -# -# SublimeText -# -function addRepo_SublimeText () { - addKey "https://download.sublimetext.com/sublimehq-pub.gpg" - addRepo sublime-text.list \ - "deb https://download.sublimetext.com/ apt/dev/" -} - -# -# Ansible -# -function addRepo_Ansible () { - addPPA ppa:ansible/ansible -} - -# -# Docker CE -# -function addRepo_DockerCE () { - addKey "https://download.docker.com/linux/ubuntu/gpg" - addRepo "docker.list" \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu xenial stable" -} - -# -# Gyazo -# -function addRepo_Gyazo () { - addKey "https://packagecloud.io/gyazo/gyazo-for-linux/gpgkey" - addRepo "gyazo_gyazo-for-linux.list" \ - "deb https://packagecloud.io/gyazo/gyazo-for-linux/ubuntu/ xenial main" \ - "deb-src https://packagecloud.io/gyazo/gyazo-for-linux/ubuntu/ xenial main" -} - -# -# MongoDB 3 CE -# -function addRepo_MongoDB3CE () { - addKey "https://www.mongodb.org/static/pgp/server-3.6.asc" - addRepo "mongodb-org-3.6.list" \ - "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu xenial/mongodb-org/3.6 multiverse" -} - -# -# Wine Build -# -function addRepo_Wine () { - addKey "https://dl.winehq.org/wine-builds/Release.key" - addRepo "winehq.list" \ - "deb https://dl.winehq.org/wine-builds/ubuntu/ xenial main" -} - -# -# LibreOffice 6 -# -function addRepo_Libreoffice6 () { - addPPA ppa:libreoffice/ppa -} - -# -# Kodi (Beta) -# -function addRepo_KodiBeta () { - addPPA ppa:team-xbmc/unstable -} - -# -# Kodi (Nightly) -# -function addRepo_KodiNightly () { - addPPA ppa:team-xbmc/xbmc-nightly -} - -# -# Visual Studio Code -# -function addRepo_VSCode () { - addKey "https://packages.microsoft.com/keys/microsoft.asc" - addRepo "vscode.list" \ - "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main" -} - -# -# Android-Studio -# -function addRepo_AndroidStudio () { - addPPA ppa:maarten-fonville/android-studio -} - -#-----------------------------------------------------------------------------# -# Package pre install functions list # -#-----------------------------------------------------------------------------# - -# -# list of pre install functions -# fields : unique ID, function to process before install -# -AppsPreTrtFct="opera-stable;opera_PreTrtFct -steam;steam_PreTrtFct -wireshark;wireshark_PreTrtFct -oracle-java10-installer;java10_PreTrtFct -oracle-java10-set-default;java10_PreTrtFct" - -# -# JAVA 10 -# -function java10_PreTrtFct () { - runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ - "accepting Oracle Java SE 10 licence agreement" -} - -# -# Opera -# -function opera_PreTrtFct () { - runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \ - "setting as do not add repo" -} - -# -# Steam -# -function steam_PreTrtFct () { - runCmd "echo \"steam steam/purge note\" | sudo debconf-set-selections" \ - "accepting steam licence" - runCmd "echo \"steam steam/license note\" | sudo debconf-set-selections" \ - "accepting steam licence 2/3" - runCmd "echo \"steam steam/question select I AGREE\" | sudo debconf-set-selections" \ - "accepting steam licence 3/3" -} - -# -# Wireshark -# -function wireshark_PreTrtFct () { - runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \ - "setting Wireshark as root only" -} - -#-----------------------------------------------------------------------------# -# Package post install functions list # -#-----------------------------------------------------------------------------# - -# -# list of post install functions -# fields : unique ID, function to process after install -# -AppsPostTrtFct="nitrogen;nitrogen_PostTrtFct -mongodb;mongodb_PostTrtFct -qttools5-dev-tools;qt_PostTrtFct -plank;plank_PostTrtFct -androidstudio;android_PostTrtFct -nodejs8lts;nodejs8lts_PostTrtFct -angularcli;angularcli_PostTrtFct" - -# -# Angular CLI -# -function angularcli_PostTrtFct () { - if which yarn >/dev/null; then - runCmd "ng config -g cli.packageManager yarn" - "using yarn instead of nom for angular/cli" - fi -} - -# -# NodeJS 8 LTS -# -function nodejs8lts_PostTrtFct () { - msg "Sanitizing NodeJS install" - if which /usr/local/bin/node >/dev/null; then - runCmd "sudo rm /usr/local/bin/node" \ - "cleaning/removing legacy node files" - else - print "[INFO] nothing to clean, good :-)" - fi -} - -# -# Android Env for adb, fastboot, .... -# -function android_PostTrtFct () { - printf "[CMD] Adding Android devices UDEV rules " - -cat << EOF | sudo tee /etc/udev/rules.d/99-android.rules -SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", OWNER="$myHomedir" # Acer -SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", OWNER="$myHomedir" # Asus -SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", OWNER="$myHomedir" # Dell -SUBSYSTEM=="usb", ATTR{idVendor}=="0489", MODE="0666", OWNER="$myHomedir" # Foxconn -SUBSYSTEM=="usb", ATTR{idVendor}=="04c5", MODE="0666", OWNER="$myHomedir" # Fujitsu -SUBSYSTEM=="usb", ATTR{idVendor}=="04c5", MODE="0666", OWNER="$myHomedir" # Fujitsu-Toshiba -SUBSYSTEM=="usb", ATTR{idVendor}=="091e", MODE="0666", OWNER="$myHomedir" # Garmin-Asus -SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", OWNER="$myHomedir" # Google-Nexus -SUBSYSTEM=="usb", ATTR{idVendor}=="201E", MODE="0666", OWNER="$myHomedir" # Haier -SUBSYSTEM=="usb", ATTR{idVendor}=="109b", MODE="0666", OWNER="$myHomedir" # Hisense -SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", OWNER="$myHomedir" # HTC -SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", MODE="0666", OWNER="$myHomedir" # Huawei -SUBSYSTEM=="usb", ATTR{idVendor}=="8087", MODE="0666", OWNER="$myHomedir" # Intel -SUBSYSTEM=="usb", ATTR{idVendor}=="24e3", MODE="0666", OWNER="$myHomedir" # K-Touch -SUBSYSTEM=="usb", ATTR{idVendor}=="2116", MODE="0666", OWNER="$myHomedir" # KT Tech -SUBSYSTEM=="usb", ATTR{idVendor}=="0482", MODE="0666", OWNER="$myHomedir" # Kyocera -SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0666", OWNER="$myHomedir" # Lenovo -SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", OWNER="$myHomedir" # LG -SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", OWNER="$myHomedir" # Motorola -SUBSYSTEM=="usb", ATTR{idVendor}=="0e8d", MODE="0666", OWNER="$myHomedir" # MTK -SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", OWNER="$myHomedir" # NEC -SUBSYSTEM=="usb", ATTR{idVendor}=="2080", MODE="0666", OWNER="$myHomedir" # Nook -SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0666", OWNER="$myHomedir" # Nvidia -SUBSYSTEM=="usb", ATTR{idVendor}=="2257", MODE="0666", OWNER="$myHomedir" # OTGV -SUBSYSTEM=="usb", ATTR{idVendor}=="10a9", MODE="0666", OWNER="$myHomedir" # Pantech -SUBSYSTEM=="usb", ATTR{idVendor}=="1d4d", MODE="0666", OWNER="$myHomedir" # Pegatron -SUBSYSTEM=="usb", ATTR{idVendor}=="0471", MODE="0666", OWNER="$myHomedir" # Philips -SUBSYSTEM=="usb", ATTR{idVendor}=="04da", MODE="0666", OWNER="$myHomedir" # PMC-Sierra -SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", MODE="0666", OWNER="$myHomedir" # Qualcomm -SUBSYSTEM=="usb", ATTR{idVendor}=="1f53", MODE="0666", OWNER="$myHomedir" # SK Telesys -SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", OWNER="$myHomedir" # Samsung -SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", OWNER="$myHomedir" # Sharp -SUBSYSTEM=="usb", ATTR{idVendor}=="054c", MODE="0666", OWNER="$myHomedir" # Sony -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", OWNER="$myHomedir" # Sony Ericsson -SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", OWNER="$myHomedir" # Sony Mobile Communications -SUBSYSTEM=="usb", ATTR{idVendor}=="2340", MODE="0666", OWNER="$myHomedir" # Teleepoch -SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", OWNER="$myHomedir" # Toshiba -SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", OWNER="$myHomedir" # ZTE -EOF - - ret_code=$? - retCode $ret_code - - runCmd "sudo service udev restart" \ - "restarting UDEV service" -} - -# -# Plank themes -# -function plank_PostTrtFct () { - typeset ret_code - - if ! (( $(ps -ef | grep -v grep | grep plank | wc -l) > 0 )); then - plank 2&>1 >/dev/null & - sleep 10 - fi - - yes | sh -c "cd ~ \ - && mkdir -p ~/.temp-plank-themer \ - && cd ~/.temp-plank-themer \ - && wget https://github.com/rhoconlinux/plank-themer/archive/master.zip \ - && unzip master.zip \ - && cd plank-themer-master/ \ - && rm -fR ~/.config/plank/dock1/theme_index; \ - rm -fR ~/.config/plank/dock1/themes-repo; \ - mkdir -p ~/.config/plank/dock1; \ - cp -a theme_index/ ~/.config/plank/dock1 \ - && cp -a themes-repo/ ~/.config/plank/dock1 \ - && cd ~ \ - && rm -R ~/.temp-plank-themer \ - && sh ~/.config/plank/dock1/theme_index/plank-on-dock-themer.sh" &>> $logFile - ret_code=$? - retCode $ret_code -} - -# -# QT5 Dev Tools -# -function qt_PostTrtFct () { - runCmd "sudo ln -s /usr/share/qtchooser/qt5-x86_64-linux-gnu.conf /usr/lib/x86_64-linux-gnu/qtchooser/default.conf" \ - "set QT5 as default" - - createAppShortcut "/usr/bin/designer" \ - "" \ - "GNOME;GTK;Development;IDE" \ - "QT Designer 5" \ - "local" \ - update-menus -} - -# -# MongoDB 3 CE -# -function mongodb_PostTrtFct () { - runCmd "sudo systemctl enable mongod.service" \ - "enabling mongod service at boot" - runCmd "sudo systemctl start mongod.service" \ - "starting mongod service" -} - -# -# nitrogen post install function -# -function nitrogen_PostTrtFct () { - if isMate; then - runCmd "gsettings set org.mate.background draw-background false" \ - "disabling Caja background management" - runCmd "gsettings set org.mate.background show-desktop-icons false" \ - "disabling Caja desktop icons management" - - createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ - "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ - "Utility;GTK" \ - "Nitrogen" \ - "local" \ - "start" - update-menus - elif isCinnamon; then - runCmd "gsettings set org.nemo.desktop draw-background false" \ - "disabling Caja background management" - runCmd "gsettings set org.nemo.desktop show-desktop-icons false" \ - "disabling Caja desktop icons management" - - createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ - "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ - "Utility;GTK" \ - "Nitrogen" \ - "local" \ - "start" - update-menus - else - printf "[ERR] only Mate/Cinnamon Desktop is currently supported\n" - fi -} diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index ad2e1fa..b6984e7 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -167,7 +167,6 @@ byobu;apt;utilities;byobu mupdf;apt;utilities;mupdf mupdf-tools;apt;utilities;mupdf-tools pdfarranger;apt;utilities;pdfarranger -ukuu;apt;utilities;ukuu fcrackzip;apt;utilities;fcrackzip rarcrack;apt;utilities;rarcrack pdfcrack;apt;utilities;pdfcrack @@ -175,7 +174,6 @@ figlet;apt;utilities;figlet alltray;apt;utilities;alltray kdocker;apt;utilities;kdocker cheat;pip;utilities;cheat -mate-sensors-applet-nvidia;apt;utilities;mate-sensors-applets-nvidia woeusb;apt;utilities;woeusb screenkey;apt;utilities;screenkey pdfgrep;apt;utilities;pdfgrep @@ -312,31 +310,6 @@ pcscd;apt;cardreader;pcscd pcsc-tools;apt;cardreader;pcsc-tools guvcview;apt;webcam;guvcview cheese;apt;webcam;cheese -nvidia-384;apt;nvidia-384;nvidia-384 -nvidia-settings;apt;nvidia-384;nvidia-settings -nvidia-opencl-icd-384;apt;nvidia-384;nvidia-opencl-icd-384 -libcuda1-384;apt;nvidia-384;libcuda1-384 -nvidia-387;apt;nvidia-387;nvidia-387 -nvidia-settings;apt;nvidia-387;nvidia-settings -nvidia-opencl-icd-387;apt;nvidia-387;nvidia-opencl-icd-387 -libcuda1-387;apt;nvidia-387;libcuda1-387 -nvidia-390;apt;nvidia-390;nvidia-390 -nvidia-settings;apt;nvidia-390;nvidia-settings -nvidia-opencl-icd-390;apt;nvidia-390;nvidia-opencl-icd-390 -nvidia-utils-390;apt;nvidia-390;nvidia-utils-390 -libcuda1-390;apt;nvidia-390;libcuda1-390 -nvidia-driver-396;apt;nvidia-driver-396;nvidia-driver-396 -nvidia-settings;apt;nvidia-driver-396;nvidia-settings -nvidia-utils-396;apt;nvidia-driver-396;nvidia-utils-396 -libnvidia-gl-396:i386;apt;nvidia-driver-396;libnvidia-gl-396:i386 -nvidia-driver-410;apt;nvidia-driver-410;nvidia-driver-410 -nvidia-settings;apt;nvidia-driver-410;nvidia-settings -nvidia-utils-410;apt;nvidia-driver-410;nvidia-utils-410 -libnvidia-gl-410:i386;apt;nvidia-driver-410;libnvidia-gl-410:i386 -nvidia-driver-415;apt;nvidia-driver-415;nvidia-driver-415 -nvidia-settings;apt;nvidia-driver-415;nvidia-settings -nvidia-utils-415;apt;nvidia-driver-415;nvidia-utils-415 -libnvidia-gl-415:i386;apt;nvidia-driver-415;libnvidia-gl-415:i386 tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq gpick;apt;dev;gpick @@ -434,7 +407,7 @@ gitkraken;snap;gitkraken;gitkraken" AppsRepo="kodi-beta;addRepo_KodiBeta kodi-nightly;addRepo_KodiNightly libreoffice6;addRepo_Libreoffice6 -mongodb;addRepo_MongoDB3CE +mongodb;addRepo_MongoDB_CE gyazo;addRepo_Gyazo code;addRepo_VSCode androidstudio;addRepo_AndroidStudio @@ -460,7 +433,6 @@ skypeforlinux;addRepo_SkypeForLinux shotwell;addRepo_Shotwell peek;addRepo_Peek sqlitebrowser;addRepo_SQLiteBrowser -ukuu;addRepo_Teejee2008 aptik;addRepo_Teejee2008 avidemux2.6-plugins-qt;addRepo_Avidemux2.6 avidemux2.6-qt;addRepo_Avidemux2.6 @@ -523,29 +495,6 @@ rhythmbox-plugin-spectrum;addRepo_Rhythmbox rhythmbox-plugin-suspend;addRepo_Rhythmbox rhythmbox-plugin-wikipedia;addRepo_Rhythmbox rhythmbox-plugins;addRepo_Rhythmbox -nvidia-settings;addRepo_NvidiaDrivers -nvidia-370;addRepo_NvidiaDrivers -nvidia-opencl-icd-370;addRepo_NvidiaDrivers -nvidia-375;addRepo_NvidiaDrivers -nvidia-opencl-icd-375;addRepo_NvidiaDrivers -nvidia-378;addRepo_NvidiaDrivers -nvidia-opencl-icd-378;addRepo_NvidiaDrivers -libcuda1-378;addRepo_NvidiaDrivers -nvidia-381;addRepo_NvidiaDrivers -nvidia-opencl-icd-381;addRepo_NvidiaDrivers -libcuda1-381;addRepo_NvidiaDrivers -nvidia-384;addRepo_NvidiaDrivers -nvidia-opencl-icd-384;addRepo_NvidiaDrivers -libcuda1-384;addRepo_NvidiaDrivers -nvidia-387;addRepo_NvidiaDrivers -nvidia-opencl-icd-387;addRepo_NvidiaDrivers -libcuda1-387;addRepo_NvidiaDrivers -nvidia-390;addRepo_NvidiaDrivers -nvidia-opencl-icd-390;addRepo_NvidiaDrivers -libcuda1-390;addRepo_NvidiaDrivers -nvidia-396;addRepo_NvidiaDrivers -nvidia-opencl-icd-396;addRepo_NvidiaDrivers -libcuda1-396;addRepo_NvidiaDrivers rawtherapee;addRepo_DhorMyWay entangle;addRepo_DhorMyWay mkvtoolnix-gui;addRepo_MKVToolnix @@ -685,13 +634,6 @@ function addRepo_DhorMyWay () { addPPA ppa:dhor/myway } -# -# Nvidia drivers -# -function addRepo_NvidiaDrivers () { - addPPA ppa:graphics-drivers/ppa -} - # # Rhythmbox # @@ -862,7 +804,7 @@ function addRepo_Avidemux2.6 () { } # -# aptik, conky-manager, selene, timeshift, ukuu +# aptik, conky-manager, selene, timeshift # function addRepo_Teejee2008 () { addPPA ppa:teejee2008/ppa @@ -1052,7 +994,7 @@ function addRepo_Gyazo () { # # MongoDB 4 CE # -function addRepo_MongoDB3CE () { +function addRepo_MongoDB_CE () { addKey "https://www.mongodb.org/static/pgp/server-4.0.asc" addRepo "mongodb-org-4.0.list" \ "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" @@ -1303,7 +1245,7 @@ function qt_PostTrtFct () { } # -# MongoDB 3 CE +# MongoDB CE # function mongodb_PostTrtFct () { runCmd "sudo systemctl enable mongod.service" \ diff --git a/vars.sh b/vars.sh index 56d2f3d..384360f 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.0-b23" +version="0.5.1-b1" # # myHomedir is used in full paths to the homedir diff --git a/yggdrasil.sh b/yggdrasil.sh index dce0dee..9b64216 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -18,9 +18,11 @@ source /opt/yggdrasil/tools_functions.sh || exit 1 OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` case $OS in *"Ubuntu 16.04"* | *"Linux Mint 18"*) - source /opt/yggdrasil/repo_functions_ub1604.sh || exit 1 - source /opt/yggdrasil/install_functions_ub1604.sh || exit 1 - source /opt/yggdrasil/menus_functions_ub1604.sh || exit 1 + printf "\n" + printf $BOLDROUGE"Yggdrasil for Ubuntu 16.04 / Linux Mint 18 is no longer available.\n"$NORMAL + printf "If you still need it, use an older version of Yggdrasil previous to 0.5.1.\n" + printf "Thanks for using Yggdrasil" + printf "\n" ;; *"Ubuntu 18.04"* | *"Linux Mint 19"*) source /opt/yggdrasil/repo_functions_ub1804.sh || exit 1 @@ -60,7 +62,7 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >> # # arguments/options management with getopts -while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do +while getopts ":h,v,f,c,u,a,d,q,s,t,w,p" option; do case "$option" in a) # install all apps if [ $ygginitCount = false ]; then @@ -220,27 +222,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,n,w,p,k" option; do msg "Installing TLP" installAppsFromList tlp ;; - n) # latest nvidia driver (see menus if need older version) - if [ $ygginitCount = false ]; then - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem - ygginitCount=true - fi - installAppsFromList nvidia-driver-415 - ;; - k) - if [ $ygginitCount = false ]; then - msg "Initializing" - yggInit - msg "Updating the system" - updateSystem - ygginitCount=true - fi - msg "Updating Kernel" - kernelUpdate - ;; u) msg "Initializing" yggInit From 14968329a0f698a70e1e04d9a27d3764326873a0 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 9 Jul 2019 22:42:40 +0200 Subject: [PATCH 161/261] doc upd --- README.md | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index abdccb6..b74b75e 100644 --- a/README.md +++ b/README.md @@ -5,16 +5,16 @@ About __!! Warnings : this is a early beta version !!__ -The purpose of this script is to provide a tool to install, customize and tweak a fresh installation of Linux Mint 18.x/19.x, Ubuntu 16.04/18.04 and derivatives +The purpose of this script is to provide a tool to install, customize and tweak a fresh installation of Linux Mint 19.x, Ubuntu 18.04 -The Linux Mint 18 branch is now freezed and only bugs will be fixed. - -New features are only added to Linux Mint 19 branch from now. +The Linux Mint 18 / Ubuntu 16.04 branch is now removed since the 0.5.1 version of Yggdrasil. +No bugs fixed, features or any changes will be made on this branch anymore. +If you still need it, please use an older version from the repository at your own risk ;) Installation ------------ -Linux Mint 18 +Linux Mint 18 / Ubuntu 16.04 (Yggdrasil < 0.5.1) ```shell curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - @@ -23,7 +23,7 @@ sudo apt-get update sudo apt-get install yggdrasil ``` -Linux Mint 19 +Linux Mint 19 / Ubuntu 18.04 (Yggdrasil >= 0.5.1) ```shell curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - From 12c28d94f79646a0fe954991a181a2e0397b44eb Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 9 Jul 2019 23:03:38 +0200 Subject: [PATCH 162/261] PPA added for youtube-dlg + docker posttrt fct bug fixed --- repo_functions_ub1804.sh | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index b6984e7..a0ff3a8 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -50,8 +50,6 @@ dia;apt;multimedia;dia mpv;apt;multimedia;mpv picard;apt;multimedia;picard inkscape;apt;multimedia;inkscape -mypaint;apt;multimedia;mypaint -mypaint-data-extras;apt;multimedia;mypaint-data-extras audacity;apt;multimedia;audacity blender;apt;multimedia;blender kodi;apt;multimedia;kodi @@ -504,6 +502,7 @@ qt5ct;addRepo_Webupd8 screenkey;addRepo_Webupd8 yad;addRepo_Webupd8 woeusb;addRepo_Webupd8 +youtube-dlg;addRepo_Webupd8 cpu-g;addRepo_Atareao iridiumbrowser;addRepo_Iridium picard;addRepo_Picard @@ -1124,10 +1123,10 @@ function dockerio_PostTrtFct () { "start docker service" runCmd "sudo systemctl enable docker" \ "add docker service at boot" - rundCmd "sudo groupadd docker" \ + runCmd "sudo groupadd docker" \ "add docker group" cUser=$(whoami) - rundCmd "sudo usermod -aG docker $cUser" \ + runCmd "sudo usermod -aG docker $cUser" \ "add current user to docker group" } From 21baac1ffad201339f0a409b56b7fe9d4776e54c Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 9 Jul 2019 23:10:02 +0200 Subject: [PATCH 163/261] typo version fixed --- menus_functions_ub1804.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 0dfeb16..e0e7357 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -200,7 +200,7 @@ function showDevInstallMenu () { "devbase" "dev apps and tools" \ "java10" "Java 10 dev env" \ "javascript" "JavaScript dev env" \ - "mongodb3ce" "MongoDB 3 CE" \ + "mongodbce" "MongoDB CE" \ "php" "PHP dev env" \ "lua" "Lua dev env" \ "ruby" "Ruby dev env" \ @@ -234,7 +234,7 @@ function showDevInstallMenu () { "javascript") installAppsFromListMenu javascript ;; - "mongodb3ce") + "mongodbce") installAppsFromListMenu mongodb ;; "php") From 48089fc9328c2325b1104fa3044782cb4b2d8ddc Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 9 Jul 2019 23:15:18 +0200 Subject: [PATCH 164/261] Oracle Java 10 replaced by OpenJDK 11 --- menus_functions_ub1804.sh | 6 +++--- repo_functions_ub1804.sh | 14 ++------------ 2 files changed, 5 insertions(+), 15 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index e0e7357..04942cc 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -198,7 +198,7 @@ function showDevInstallMenu () { --menu "Install Dev apps from different submenus" \ 25 80 16 \ "devbase" "dev apps and tools" \ - "java10" "Java 10 dev env" \ + "java11" "OpenJDK Java 11 dev env" \ "javascript" "JavaScript dev env" \ "mongodbce" "MongoDB CE" \ "php" "PHP dev env" \ @@ -228,8 +228,8 @@ function showDevInstallMenu () { "devbase") installAppsFromListMenu dev ;; - "java10") - installAppsFromListMenu java10 + "java11") + installAppsFromListMenu java11 ;; "javascript") installAppsFromListMenu javascript diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index a0ff3a8..c1a0e0c 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -342,8 +342,7 @@ ionic;npm;javascript;ionic cordova;npm;javascript;cordova eslint;npm;javascript;eslint web-ext;npm;javascript;web-ext -oracle-java10-installer;apt;java10;oracle-java10-installer -oracle-java10-set-default;apt;java10;oracle-java10-set-default +openjdk-11-jdk;apt;java11;openjdk-11-jdk php7.2-cli;apt;php;php7.2-cli php-pear;apt;php;php-pear composer;apt;php;composer @@ -1046,17 +1045,8 @@ function addRepo_AndroidStudio () { # AppsPreTrtFct="opera-stable;opera_PreTrtFct steam;steam_PreTrtFct -wireshark;wireshark_PreTrtFct -oracle-java10-installer;java10_PreTrtFct -oracle-java10-set-default;java10_PreTrtFct" +wireshark;wireshark_PreTrtFct" -# -# JAVA 10 -# -function java10_PreTrtFct () { - runCmd "echo oracle-java10-installer shared/accepted-oracle-license-v1-1 select true | sudo debconf-set-selections" \ - "accepting Oracle Java SE 10 licence agreement" -} # # Opera # From 5180c5f7ca0b272305d7be8cee6d95e0c46d747a Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 9 Jul 2019 23:18:05 +0200 Subject: [PATCH 165/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 384360f..64fe2bb 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.1-b1" +version="0.5.1-b2" # # myHomedir is used in full paths to the homedir From 70601c9663da3a0b2b787b523a8cb3871b173b8c Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 10 Jul 2019 19:13:15 +0200 Subject: [PATCH 166/261] pycharm pro added --- menus_functions_ub1804.sh | 10 +++++++--- repo_functions_ub1804.sh | 3 ++- vars.sh | 2 +- 3 files changed, 10 insertions(+), 5 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 04942cc..4115a81 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -213,7 +213,8 @@ function showDevInstallMenu () { "geany" "Geany" \ "idea" "Idea" \ "eclipse" "Eclipse" \ - "pycharm" "PyCharm" \ + "pycharmprofessional" "PyCharm Professional edition" \ + "pycharmcommunity" "PyCharm Community edition" \ "vsc" "Visual Studio Code" \ "androidstudio" "Android Studio" \ "sublimetext" "Sublime Text" \ @@ -273,8 +274,11 @@ function showDevInstallMenu () { "eclipse") installAppsFromListMenu eclipse ;; - "pycharm") - installAppsFromListMenu pycharm + "pycharmprofessional") + installAppsFromListMenu pycharm-professional + ;; + "pycharmcommunity") + installAppsFromListMenu pycharm-community ;; "vsc") installAppsFromListMenu code diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index c1a0e0c..40e0c80 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -357,7 +357,8 @@ codeblocks;apt;codeblocks;codeblocks codeblocks-contrib;apt;codeblocks;codeblocks-contrib geany;apt;geany;geany geany-plugins;apt;geany;geany-plugins -pycharm-community;snap;pycharm;pycharm +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 diff --git a/vars.sh b/vars.sh index 64fe2bb..ead4a14 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.1-b2" +version="0.5.1-b3" # # myHomedir is used in full paths to the homedir From 9938c1fe3d30c91e17c46a1b32dfea399d711d24 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 10 Jul 2019 19:22:12 +0200 Subject: [PATCH 167/261] manually downloaded package updated --- install_functions_ub1804.sh | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 05453fd..d8dc7f0 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -38,7 +38,7 @@ function installViberMenu () { # Franz (headless) # function installFranz () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.18/franz_5.0.0-beta.18_amd64.deb \ + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.1.0/franz_5.1.0_amd64.deb \ franz.deb \ no } @@ -47,7 +47,7 @@ function installFranz () { # Franz (Menu) # function installFranzMenu () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.0.0-beta.18/franz_5.0.0-beta.18_amd64.deb \ + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.1.0/franz_5.1.0_amd64.deb \ franz.deb \ yes } @@ -56,7 +56,7 @@ function installFranzMenu () { # Slack (headless) # function installSlack () { - installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.2.1-amd64.deb \ + installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.4.2-amd64.deb \ slack.deb \ no } @@ -65,7 +65,7 @@ function installSlack () { # Slack (Menu) # function installSlackMenu () { - installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.2.1-amd64.deb \ + installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.4.2-amd64.deb \ slack.deb \ yes } @@ -167,7 +167,7 @@ function installTeamViewer13Menu () { # install Compass (headless) # function installCompass () { - installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.13.1_amd64.deb \ + installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.18.0_amd64.deb \ compass.deb \ no } @@ -176,7 +176,7 @@ function installCompass () { # install Compass (Menu) # function installCompassMenu () { - installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.13.1_amd64.deb \ + installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.18.0_amd64.deb \ compass.deb \ yes } @@ -185,7 +185,7 @@ function installCompassMenu () { # Boostnotes (headless) # function installBoostnotes () { - installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.17/boostnote_0.11.17_amd64.deb \ boostnotes.deb \ no } @@ -194,7 +194,7 @@ function installBoostnotes () { # Boostnotes (Menu) # function installBoostnotesMenu () { - installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.4/boostnote_0.11.4_amd64.deb \ + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.17/boostnote_0.11.17_amd64.deb \ boostnotes.deb \ yes } From cdc6edf0698e8a69409f3cc279f5d62fffb13dbf Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 10 Jul 2019 19:24:09 +0200 Subject: [PATCH 168/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index ead4a14..b9ac168 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.1-b3" +version="0.5.1-b4" # # myHomedir is used in full paths to the homedir From 0cc054a187a2bdc818ba7ad1f1778b13ea73e728 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 10 Jul 2019 22:18:22 +0200 Subject: [PATCH 169/261] wine hq repo added --- repo_functions_ub1804.sh | 14 ++++++++++++-- vars.sh | 2 +- 2 files changed, 13 insertions(+), 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 40e0c80..99151c7 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -376,7 +376,7 @@ nitrogen;apt;nitrogen;nitrogen firefox-trunk;apt;nightly;firefox-trunk firefox-trunk-locale-fr;apt;nightly;firefox-trunk-locale-fr libreoffice;apt;office;libreoffice6 -wine-development;apt;wine;wine-development +winehq-stable;apt;wine;winehq-stable winetricks;apt;wine;winetricks playonlinux;apt;wine;playonlinux mongodb-org;apt;mongodb;mongodb @@ -511,7 +511,17 @@ pdfarranger;addRepo_Linuxuprising kdenlive;addRepo_KDEnlive megasync;addRepo_MEGA lutris;addRepo_Lutris -guake;addRepo_LinuxUprising_Guake" +guake;addRepo_LinuxUprising_Guake +winehq-stable;addRepo_WineHQ" + +# +# Wine HQ +# +function addRepo_WineHQ () { + addKey "https://dl.winehq.org/wine-builds/winehq.key" + addRepo winehq.list \ + "deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main" +} # # Lutris diff --git a/vars.sh b/vars.sh index b9ac168..332d16d 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.1-b4" +version="0.5.1-b5" # # myHomedir is used in full paths to the homedir From 8733d5bb186cae591c5369ed0f2f36ed1e2ee3a7 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 10 Jul 2019 22:50:00 +0200 Subject: [PATCH 170/261] HWE added --- core_functions.sh | 1 + menus_functions_ub1804.sh | 4 ++++ repo_functions_ub1804.sh | 6 +++++- yggdrasil.sh | 13 ++++++++++++- 4 files changed, 22 insertions(+), 2 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 9c9eb60..bbde3c0 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -631,6 +631,7 @@ function usage () { printf " "$BOLDVERT"-q"$NORMAL" : install cardreader apps\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"-k"$NORMAL" : install HWE (Ubuntu's Hardware Enablement Stack)(newer kernel+xorg)\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" diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 4115a81..0bcfcac 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -441,6 +441,7 @@ function showHardwareMenu () { --title "Yggdrasil $version - System Tools" \ --menu "System tools to diagnose and optimize" \ 25 80 16 \ + "HWE" "Ubuntu Hardware Enablement Stack (newer kernel+xorg)" \ "cardreader" "Apps/tools needed for cardreaders" \ "solaar" "Solaar for Logitech Unifying devices" \ "webcam" "Install webcam neede apps" \ @@ -451,6 +452,9 @@ function showHardwareMenu () { "Back" "Back" 3>&1 1>&2 2>&3) case $hardwareMenuOptions in + "HWE") + installAppsFromListMenu hwe + ;; "cardreader") installAppsFromListMenu cardreader ;; diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 99151c7..95bb596 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -392,7 +392,11 @@ calibre;apt;ebook;calibre android-studio;apt;androidstudio;androidstudio intellij-idea-community;snap;idea;idea eclipse;snap;eclipse;eclipse -gitkraken;snap;gitkraken;gitkraken" +gitkraken;snap;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 +linux-generic-hwe-18.04;apt;hwe;linux-generic-hwe-18.04 +linux-hwe-tools;apt;hwe;linux-hwe-tools" #-----------------------------------------------------------------------------# # Specific Repo list and functions # diff --git a/yggdrasil.sh b/yggdrasil.sh index 9b64216..a873ac2 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -62,7 +62,7 @@ echo "--[ Yggdrasil log ]--[ "$cDate" ]--[ "$cTime" ]-----------------------" >> # # arguments/options management with getopts -while getopts ":h,v,f,c,u,a,d,q,s,t,w,p" option; do +while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do case "$option" in a) # install all apps if [ $ygginitCount = false ]; then @@ -222,6 +222,17 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,p" option; do msg "Installing TLP" installAppsFromList tlp ;; + k) # Ubuntu Hardware Enablement Stack + if [ $ygginitCount = false ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=true + fi + msg "Installing HWE (newer kernel+xorg)" + installAppsFromList hwe + ;; u) msg "Initializing" yggInit From b8bf632c23d1316c06ae18e68e003be96c2b3607 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 10 Jul 2019 22:50:55 +0200 Subject: [PATCH 171/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 332d16d..a62d5d2 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.1-b5" +version="0.5.1-b6" # # myHomedir is used in full paths to the homedir From a309dfc484b3bcaab75c3736782cecb05f534f3e Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 10 Jul 2019 22:58:46 +0200 Subject: [PATCH 172/261] bug fixed on HWE --- repo_functions_ub1804.sh | 3 +-- vars.sh | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 95bb596..ab1f381 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -395,8 +395,7 @@ eclipse;snap;eclipse;eclipse gitkraken;snap;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 -linux-generic-hwe-18.04;apt;hwe;linux-generic-hwe-18.04 -linux-hwe-tools;apt;hwe;linux-hwe-tools" +linux-generic-hwe-18.04;apt;hwe;linux-generic-hwe-18.04" #-----------------------------------------------------------------------------# # Specific Repo list and functions # diff --git a/vars.sh b/vars.sh index a62d5d2..763b00c 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.1-b6" +version="0.5.1-b7" # # myHomedir is used in full paths to the homedir From 043c22af87222ec1a387c1220dec32b4e59e6c1d Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Thu, 11 Jul 2019 11:04:32 +0200 Subject: [PATCH 173/261] tig added --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index ab1f381..78e9813 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -331,6 +331,7 @@ mycli;pip;dev;mycli sqlitebrowser;apt;dev;sqlitebrowser mysql-workbench;apt;dev;mysql-workbench jq;apt;dev;jq +tig;apt;dev;tig nodejs;apt;javascript;nodejs8lts javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn From e2c2e450be52fd9284d10a10868adff351eee049 Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Thu, 11 Jul 2019 11:17:58 +0200 Subject: [PATCH 174/261] NodeJS LTS 8 -> 10 --- repo_functions_ub1804.sh | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 78e9813..cf36807 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -332,7 +332,7 @@ sqlitebrowser;apt;dev;sqlitebrowser mysql-workbench;apt;dev;mysql-workbench jq;apt;dev;jq tig;apt;dev;tig -nodejs;apt;javascript;nodejs8lts +nodejs;apt;javascript;nodejslts javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn emma-cli;npm;javascript;emma-cli @@ -429,7 +429,7 @@ wireshark;addRepo_WireShark darktable;addRepo_DarkTable brackets;addRepo_Brackets kicad;addRepo_Kicad -nodejs8lts;addRepo_NodeLts8 +nodejslts;addRepo_NodeLts telegram;addRepo_Telegram skypeforlinux;addRepo_SkypeForLinux shotwell;addRepo_Shotwell @@ -861,13 +861,13 @@ function addRepo_SkypeForLinux () { } # -# Node 8 LTS +# NodeJS LTS # -function addRepo_NodeLts8 () { +function addRepo_NodeLts () { addKey "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" addRepo "nodesource.list" \ - "deb https://deb.nodesource.com/node_8.x bionic main" \ - "deb-src https://deb.nodesource.com/node_8.x bionic main" + "deb https://deb.nodesource.com/node_10.x bionic main" \ + "deb-src https://deb.nodesource.com/node_10.x bionic main" } # From bb8cbe53c26b7f0db0b8f0842fff0e17638bc3f4 Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Thu, 11 Jul 2019 11:18:24 +0200 Subject: [PATCH 175/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 763b00c..1370092 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.1-b7" +version="0.5.1-b8" # # myHomedir is used in full paths to the homedir From 1c5af0377eb156d5deb64b42eb830e8ec32840db Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Thu, 11 Jul 2019 12:52:38 +0200 Subject: [PATCH 176/261] small changes --- vars.sh | 4 ++-- yggdrasil.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/vars.sh b/vars.sh index 1370092..c3ea613 100644 --- a/vars.sh +++ b/vars.sh @@ -1,6 +1,6 @@ #------------------------------------------------------------------------------# # Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # +# compatibility : see documentation or man pages # # author : Francois B. (Makotosan/Shakasan) # # licence : GPLv3 # # website : https://makotonoblog.be/ # @@ -13,7 +13,7 @@ # # app version number # -version="0.5.1-b8" +version="0.5.1-b9" # # myHomedir is used in full paths to the homedir diff --git a/yggdrasil.sh b/yggdrasil.sh index a873ac2..dcf9433 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -1,7 +1,7 @@ #!/bin/bash #------------------------------------------------------------------------------# # Yggdrasil NG # -# compatibility : Mint 18, Ubuntu 16.04, Elementary and other derivatives # +# compatibility : Mint 19, Ubuntu 18.04 # # author : Francois B. (Makotosan/Shakasan) # # licence : GPLv3 # # website : https://makotonoblog.be/ # From 3eb63022420bb8246ed7dc446f05a076f909ce49 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 14 Jul 2019 19:25:54 +0200 Subject: [PATCH 177/261] small fix --- menus_functions_ub1804.sh | 2 +- vars.sh | 2 +- yggdrasil.sh | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 0bcfcac..c8d9ec2 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -380,7 +380,7 @@ function showAppInstallMenu () { installAppsFromListMenu cajaplugins ;; "nautilus") - installNautilusAndPluginsMenu + installAppsFromList nautilus ;; "thunar") installAppsFromListMenu thunar diff --git a/vars.sh b/vars.sh index c3ea613..4eacd6b 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.1-b9" +version="0.5.1-b10" # # myHomedir is used in full paths to the homedir diff --git a/yggdrasil.sh b/yggdrasil.sh index dcf9433..40a7b85 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -80,7 +80,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do installAppsFromList games installAppsFromList steam installAppsFromList internet - installAppsFromList java10 + installAppsFromList java11 installAppsFromList utilities installAppsFromList multimedia installAppsFromList nettools @@ -123,7 +123,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do installAppsFromList games installAppsFromList steam installAppsFromList internet - installAppsFromList java10 + installAppsFromList java11 installAppsFromList utilities installAppsFromList multimedia installAppsFromList nettools From ddb0a037ca5a3041a1db68c3b3bdc3889c5cfbaa Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 20 Jul 2019 15:37:32 +0200 Subject: [PATCH 178/261] gnome-twitch-player-backend-mpv-opengl added --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index cf36807..9310ce0 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -132,6 +132,7 @@ iridium-browser;apt;internet;iridiumbrowser youtube-dl;pip;internet;youtube-dl youtube-dlg;apt;internet;youtube-dlg gnome-twitch;snap;internet;gnome-twitch +gnome-twitch-player-backend-mpv-opengl;apt;internet;gnome-twitch gallery-dl;pip;internet;gallery-dl qtqr;apt;utilities;qtqr cpu-g;apt;utilities;cpu-g From 29a472ab35550a59663206ad8d089d64a2a17120 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 21 Jul 2019 19:18:26 +0200 Subject: [PATCH 179/261] vagrant added --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 9310ce0..a3affd5 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -333,6 +333,7 @@ sqlitebrowser;apt;dev;sqlitebrowser mysql-workbench;apt;dev;mysql-workbench jq;apt;dev;jq tig;apt;dev;tig +vagrant;apt;dev;vagrant nodejs;apt;javascript;nodejslts javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn From fb9d92767986bb514fff225ec84d4246b816cfd4 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 21 Jul 2019 19:20:21 +0200 Subject: [PATCH 180/261] . --- repo_functions_ub1804.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index a3affd5..9310ce0 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -333,7 +333,6 @@ sqlitebrowser;apt;dev;sqlitebrowser mysql-workbench;apt;dev;mysql-workbench jq;apt;dev;jq tig;apt;dev;tig -vagrant;apt;dev;vagrant nodejs;apt;javascript;nodejslts javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn From f740f25b3e138c1c5ae219d66b31411b41ab1133 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 21 Jul 2019 20:08:06 +0200 Subject: [PATCH 181/261] balena-etcher-electron --- repo_functions_ub1804.sh | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 9310ce0..c3b1db6 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -181,6 +181,7 @@ tldr;pip;utilities;tldr gyazo;apt;utilities;gyazo fdupes;apt;utilities;fdupes p7zip-desktop;snap;utilities;p7zip-desktop +balena-etcher-electron;apt;utilities;balena-etcher-electron python3-dev;apt;python;python3-dev python3-pip;apt;python;python3-pip python3-pyqt5;apt;python;python3-pyqt5 @@ -517,7 +518,19 @@ kdenlive;addRepo_KDEnlive megasync;addRepo_MEGA lutris;addRepo_Lutris guake;addRepo_LinuxUprising_Guake -winehq-stable;addRepo_WineHQ" +winehq-stable;addRepo_WineHQ +balena-etcher-electron;addRepo_Belena" + +# +# Belena Etcher +# +function addRepo_Belena () { + addKey "keyserver.ubuntu.com" \ + "379CE192D401AB61" + addRepo balena-etcher.list \ + "deb https://deb.etcher.io stable etcher" +} + # # Wine HQ From 561edd40ffb30689fdb1b3e560a1c8f8430f0e3e Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 31 Jul 2019 18:57:34 +0200 Subject: [PATCH 182/261] postman added by snap + minor bug fix --- repo_functions_ub1804.sh | 3 ++- vars.sh | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index c3b1db6..da4874a 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -108,7 +108,7 @@ syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync megasync;apt;internet;megasync -megacmd;apt;internet;megasync +megacmd;apt;internet;megacmd discord;snap;internet;discord quiterss;apt;internet;quiterss opera-stable;apt;internet;opera-stable @@ -334,6 +334,7 @@ sqlitebrowser;apt;dev;sqlitebrowser mysql-workbench;apt;dev;mysql-workbench jq;apt;dev;jq tig;apt;dev;tig +postman;snap;dev;postman nodejs;apt;javascript;nodejslts javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn diff --git a/vars.sh b/vars.sh index 4eacd6b..92b68c0 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.1-b10" +version="0.5.1-b11" # # myHomedir is used in full paths to the homedir From a09e312b4e8e577d95eec184ae04f5e505691fcb Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 17 Aug 2019 13:12:01 +0200 Subject: [PATCH 183/261] mdadm added --- repo_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index da4874a..65f2eed 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -40,6 +40,7 @@ idle3-tools;apt;base;idle3-tools snapd;apt;base;snapd sysstat;apt;base;sysstat dcfldd;apt;base;dcfldd +mdadm;apt;base;mdadm spotify;snap;multimedia;spotify sayonara;apt;multimedia;sayonara qmmp;apt;multimedia;qmmp From 54c36437b679a45106e70e2580cb53995804afd6 Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Fri, 13 Sep 2019 10:01:36 +0200 Subject: [PATCH 184/261] p7zip as snap removed --- repo_functions_ub1804.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 65f2eed..06cb772 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -181,7 +181,6 @@ coinmon;npm;utilities;coinmon tldr;pip;utilities;tldr gyazo;apt;utilities;gyazo fdupes;apt;utilities;fdupes -p7zip-desktop;snap;utilities;p7zip-desktop balena-etcher-electron;apt;utilities;balena-etcher-electron python3-dev;apt;python;python3-dev python3-pip;apt;python;python3-pip From ba056c9227fed98f1068c76e68e211c8006e716f Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Tue, 12 Nov 2019 12:52:31 +0100 Subject: [PATCH 185/261] . --- .gitignore | 3 ++- TOOD.txt | 6 ++++++ 2 files changed, 8 insertions(+), 1 deletion(-) create mode 100644 TOOD.txt diff --git a/.gitignore b/.gitignore index 3f1ab84..7985c5f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ backup/* deb/* .remote-sync.json *.sync-conflict-* -utils/* \ No newline at end of file +utils/* +TODO.txt diff --git a/TOOD.txt b/TOOD.txt new file mode 100644 index 0000000..52ad6c4 --- /dev/null +++ b/TOOD.txt @@ -0,0 +1,6 @@ +- Convert YggInit as a category (pre/post fct + add repo) +- fix npm + npm config set prefix ~/.local + add in .bashrc + PATH=~/.local/bin/:$PATH + From 0d7ca500e64f676cced885512e4e6391dbfd96f4 Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Tue, 12 Nov 2019 12:56:56 +0100 Subject: [PATCH 186/261] Revert "." This reverts commit ba056c9227fed98f1068c76e68e211c8006e716f. --- .gitignore | 3 +-- TOOD.txt | 6 ------ 2 files changed, 1 insertion(+), 8 deletions(-) delete mode 100644 TOOD.txt diff --git a/.gitignore b/.gitignore index 7985c5f..3f1ab84 100644 --- a/.gitignore +++ b/.gitignore @@ -3,5 +3,4 @@ backup/* deb/* .remote-sync.json *.sync-conflict-* -utils/* -TODO.txt +utils/* \ No newline at end of file diff --git a/TOOD.txt b/TOOD.txt deleted file mode 100644 index 52ad6c4..0000000 --- a/TOOD.txt +++ /dev/null @@ -1,6 +0,0 @@ -- Convert YggInit as a category (pre/post fct + add repo) -- fix npm - npm config set prefix ~/.local - add in .bashrc - PATH=~/.local/bin/:$PATH - From 179a0e38dfa7759b1a03a6f26e9b0857bddace99 Mon Sep 17 00:00:00 2001 From: Francois Beckers Date: Tue, 12 Nov 2019 13:05:24 +0100 Subject: [PATCH 187/261] . --- .gitignore | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 3f1ab84..7985c5f 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,5 @@ backup/* deb/* .remote-sync.json *.sync-conflict-* -utils/* \ No newline at end of file +utils/* +TODO.txt From 9a03f5e857449ab1e27d483b5da20697be49999c Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 22 Feb 2020 20:57:42 +0100 Subject: [PATCH 188/261] new release 5.2 b2 with many improvements ... --- core_functions.sh | 109 +++++----------------- install_functions_ub1804.sh | 52 +++++++++-- menus_functions_ub1804.sh | 8 ++ repo_functions_ub1804.sh | 181 ++++++++++++++++++++++++++---------- vars.sh | 22 ++--- yggdrasil.sh | 16 ++-- 6 files changed, 227 insertions(+), 161 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index bbde3c0..fc489ee 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -128,103 +128,19 @@ function isCinnamon () { # check and install required dependencies for Yggdrasil # function yggInit () { - typeset ret_code + msg "Performing some Initializing steps" - printf "[INIT]" runCmd "echo sience-config science-config/group select '$myHomedir ($myHomedir)' | sudo debconf-set-selections" \ "apply settings for science-config pkg" if ! dpkg --print-foreign-architectures | grep -qi i386; then - printf "[INIT]" runCmd "sudo dpkg --add-architecture i386" \ "adding i386 architecture" else - printf "[INIT] i386 architecture already added [ "$BOLDVERT"OK"$NORMAL" ] \n" + printf "i386 architecture already added [ "$BOLDVERT"OK"$NORMAL" ] \n" fi - printf "[INIT]" - addPPA ppa:ubuntu-desktop/ubuntu-make - - printf "[INIT][APT] update " - printf "\n[INIT][APT] update\n" &>> $logFile - sudo apt-get update &>> $logFile - ret_code=$? - retCode $ret_code - - printf "[INIT]" - installPackage apt "apt-transport-https" - - # UMAKE - if ! which umake >/dev/null; then - printf "[INIT][UMAKE] not found, installing...\n" - printf "\n[INIT][UMAKE] not found, installing...\n" &>> $logFile - installPackage apt "ubuntu-make" - else - printf "[INIT][UMAKE] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - fi - - # GEM - if ! which gem >/dev/null; then - printf "[INIT][GEM] not found, installing...\n" - printf "\n[INIT][GEM] not found, installing...\n" &>> $logFile - installPackage apt "ruby-dev" - else - printf "[INIT][GEM] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - printf "[GEM] update --system " - printf "\n[GEM] update --system\n" &>> $logFile - sudo gem update --system &>> $logFile - ret_code=$? - retCode $ret_code - fi - - # SNAP - if ! which snap >/dev/null; then - printf "[INIT][SNAP] not found, installing...\n" - printf "\n[INIT][SNAP] not found, installing...\n" &>> $logFile - installPackage apt "snapd" - else - printf "[INIT][SNAP] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - fi - - # NPM - if ! which npm >/dev/null; then - printf "[INIT][NPM] not found, installing...\n" - printf "\n[INIT][NPM] not found, installing...\n" &>> $logFile - installPackage apt "nodejs" - else - printf "[INIT][NPM] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - printf "[NPM] update npm " - printf "\n[NPM] update npm\n" &>> $logFile - sudo npm i -g npm &>> $logFile - ret_code=$? - retCode $ret_code - fi - - # PIP3 - if ! which pip3 >/dev/null; then - printf "[INIT][PIP] not found, installing...\n" - printf "\n[INIT][PIP] not found, installing...\n" &>> $logFile - printf "[INIT]" - installPackage apt "python3-pip" - if isMint19; then - printf "[INIT]" - installPackage apt "python3-distutils" - fi - printf "[INIT]" - installPackage pip "pip" - printf "[INIT]" - installPackage pip "setuptools" - else - printf "[INIT][PIP] found [ "$BOLDVERT"OK"$NORMAL" ] \n" - if isMint19; then - printf "[INIT]" - installPackage apt "python3-distutils" - fi - printf "[INIT]" - installPackage pip "pip" - printf "[INIT]" - installPackage pip "setuptools" - fi + installAppsFromList init } # @@ -260,6 +176,14 @@ function updateSystem () { retCode $ret_code fi + if which flatpak >/dev/null; then + printf "[FLATPAK] update " + printf "\n[FLATPAK] update\n" &>> $logFile + sudo flatpak update -y &>> $logFile + ret_code=$? + retCode $ret_code + fi + repoAdded=0 } @@ -384,7 +308,7 @@ function installPackage () { if which npm >/dev/null; then printf "[NPM] Installing $pkg " printf "\n[NPM] installing $pkg\n" &>> $logFile - sudo npm install -g $pkg &>> $logFile + npm install -g $pkg &>> $logFile ret_code=$? retCode $ret_code fi @@ -407,6 +331,15 @@ function installPackage () { retCode $ret_code fi ;; + "flatpak") + if which flatpak >/dev/null; then + printf "[FLATPAK] Installing $pkg " + printf "\n[FLATPAK] installing $pkg\n" &>> $logFile + sudo flatpak install -y $pkg &>> $logFile + ret_code=$? + retCode $ret_code + fi + ;; esac } diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index d8dc7f0..7faee63 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -38,7 +38,7 @@ function installViberMenu () { # Franz (headless) # function installFranz () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.1.0/franz_5.1.0_amd64.deb \ + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.4.0/franz_5.4.0_amd64.deb \ franz.deb \ no } @@ -47,7 +47,7 @@ function installFranz () { # Franz (Menu) # function installFranzMenu () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.1.0/franz_5.1.0_amd64.deb \ + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.4.0/franz_5.4.0_amd64.deb \ franz.deb \ yes } @@ -56,7 +56,7 @@ function installFranzMenu () { # Slack (headless) # function installSlack () { - installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.4.2-amd64.deb \ + installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-4.3.2-amd64.deb \ slack.deb \ no } @@ -65,7 +65,7 @@ function installSlack () { # Slack (Menu) # function installSlackMenu () { - installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-3.4.2-amd64.deb \ + installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-4.3.2-amd64.deb \ slack.deb \ yes } @@ -167,7 +167,7 @@ function installTeamViewer13Menu () { # install Compass (headless) # function installCompass () { - installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.18.0_amd64.deb \ + installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.20.5_amd64.deb \ compass.deb \ no } @@ -176,7 +176,7 @@ function installCompass () { # install Compass (Menu) # function installCompassMenu () { - installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.18.0_amd64.deb \ + installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.20.5_amd64.deb \ compass.deb \ yes } @@ -185,7 +185,7 @@ function installCompassMenu () { # Boostnotes (headless) # function installBoostnotes () { - installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.17/boostnote_0.11.17_amd64.deb \ + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.14.0/boostnote_0.14.0_amd64.deb \ boostnotes.deb \ no } @@ -194,7 +194,43 @@ function installBoostnotes () { # Boostnotes (Menu) # function installBoostnotesMenu () { - installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.11.17/boostnote_0.11.17_amd64.deb \ + installPackageDpkg https://github.com/BoostIO/boost-releases/releases/download/v0.14.0/boostnote_0.14.0_amd64.deb \ boostnotes.deb \ yes } + +# +# Vagrant (headless) +# +function installVagrant () { + installPackageDpkg https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb \ + vagrant.deb \ + no +} + +# +# Vagrant (Menu) +# +function installVagrantMenu () { + installPackageDpkg https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb \ + vagrant.deb \ + yes +} + +# +# AppImage Launcher (headless) +# +function installAppImageLauncher () { + installPackageDpkg https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.1.1/appimagelauncher_2.1.1-travis931.f6d5926.bionic_amd64.deb \ + appimagelauncher.deb \ + no +} + +# +# AppImage Launcher (Menu) +# +function installAppImageLauncherMenu () { + installPackageDpkg https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.1.1/appimagelauncher_2.1.1-travis931.f6d5926.bionic_amd64.deb \ + appimagelauncher.deb \ + yes +} \ No newline at end of file diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index c8d9ec2..005f4b7 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -223,6 +223,7 @@ function showDevInstallMenu () { "boostnotes" "Boostnotes Markdown wiki app" \ "compass" "MongoDB Compass GUI" \ "gitkraken" "Gitkraken git gui" \ + "Vagrant" "Vagrant" \ "Back" "Back" 3>&1 1>&2 2>&3) case $devInstallMenuOptions in @@ -304,6 +305,9 @@ function showDevInstallMenu () { "gitkraken") installAppsFromListMenu gitkraken ;; + "vagrant") + installVagrantMenu + ;; "Back") break ;; @@ -343,6 +347,7 @@ function showAppInstallMenu () { "viber" "Viber IM desktop app" \ "franz" "Franz multi IM app" \ "slack" "Slack App" \ + "appimagelauncher" "AppImage Launcher" \ "Back" "Back" 3>&1 1>&2 2>&3) case $appsInstallMenuOptions in @@ -409,6 +414,9 @@ function showAppInstallMenu () { "slack") installSlackMenu ;; + "appimagelauncher") + installAppImageLauncherMenu + ;; "Back") break ;; diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 06cb772..f0c8abf 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -20,7 +20,18 @@ # List of packages available # fields : package name, package manager, category, unique ID for external functions # -Apps="cifs-utils;apt;base;cifs-utils +Apps="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 +nodejs;apt;init;nodejslts +python3-pip;apt;init;python3-pip +python3-distutils;apt;init;python3-distutils +pip;pip;init;setuptools +setuptools;pip;init;setuptools +cifs-utils;apt;base;cifs-utils xterm;apt;base;xterm curl;apt;base;curl mc;apt;base;mc @@ -37,10 +48,10 @@ iptraf;apt;base;iptraf mpg123;apt;base;mpg123 debconf-utils;apt;base;debconf-utils idle3-tools;apt;base;idle3-tools -snapd;apt;base;snapd sysstat;apt;base;sysstat dcfldd;apt;base;dcfldd mdadm;apt;base;mdadm +ncdu;apt;base;ncdu spotify;snap;multimedia;spotify sayonara;apt;multimedia;sayonara qmmp;apt;multimedia;qmmp @@ -105,12 +116,14 @@ gmusicbrowser;apt;multimedia;gmusicbrowser peek;apt;multimedia;peek bino;apt;multimedia;bino kdenlive;apt;multimedia;kdenlive +com.github.huluti.ImCompressor;flatpak;multimedia;ImCompressor syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync megasync;apt;internet;megasync megacmd;apt;internet;megacmd discord;snap;internet;discord +com.teamspeak.TeamSpeak;flatpak;internet;TeamSpeak quiterss;apt;internet;quiterss opera-stable;apt;internet;opera-stable google-chrome-stable;apt;internet;google-chrome-stable @@ -119,9 +132,8 @@ chromium-browser-l10n;apt;internet;chromium-browser-l10n filezilla;apt;internet;filezilla hexchat;apt;internet;hexchat mumble;apt;internet;mumble -geary;apt;internet;geary +org.gnome.Geary;flatpak;internet;geary birdtray;apt;internet;birdtray -corebird;apt;internet;corebird telegram;apt;internet;telegram skypeforlinux;apt;internet;skypeforlinux nextcloud-client;apt;internet;nextcloud-client @@ -132,9 +144,8 @@ transmission-gtk;apt;internet;transmission-gtk iridium-browser;apt;internet;iridiumbrowser youtube-dl;pip;internet;youtube-dl youtube-dlg;apt;internet;youtube-dlg -gnome-twitch;snap;internet;gnome-twitch -gnome-twitch-player-backend-mpv-opengl;apt;internet;gnome-twitch gallery-dl;pip;internet;gallery-dl +cawbird;apt;internet;cawbird qtqr;apt;utilities;qtqr cpu-g;apt;utilities;cpu-g screenfetch;apt;utilities;screenfetch @@ -182,12 +193,13 @@ tldr;pip;utilities;tldr gyazo;apt;utilities;gyazo fdupes;apt;utilities;fdupes balena-etcher-electron;apt;utilities;balena-etcher-electron +org.gabmus.hydrapaper;flatpak;utilities;hydrapaper +nvme-cli;apt;utilities;nvme-cli +translatium;snap;utilities;translatium +font-manager;apt;utilities;font-manager python3-dev;apt;python;python3-dev -python3-pip;apt;python;python3-pip python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools -pip;pip;python;setuptools -setuptools;pip;python;setuptools PyOpenGL;pip;python;PyOpenGL tweepy;pip;python;tweepy weppy;pip;python;weppy @@ -313,9 +325,10 @@ cheese;apt;webcam;cheese tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq gpick;apt;dev;gpick -virtualbox-6.0;apt;dev;virtualbox-6.0 +virtualbox-6.1;apt;dev;virtualbox-6.1 +virtualbox-dkms;apt;dev;virtualbox-6.1 +libelf-dev;apt;dev;virtualbox-6.1 build-essential;apt;dev;build-essential -ubuntu-make;apt;dev;ubuntu-make ghex;apt;dev;ghex glade;apt;dev;glade eric;apt;dev;eric @@ -335,7 +348,6 @@ mysql-workbench;apt;dev;mysql-workbench jq;apt;dev;jq tig;apt;dev;tig postman;snap;dev;postman -nodejs;apt;javascript;nodejslts javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn emma-cli;npm;javascript;emma-cli @@ -450,7 +462,6 @@ flacon;addRepo_Flacon y-ppa-manager;addRepo_YPPAManager diodon;addRepo_Diodon sayonara;addRepo_Sayonara -corebird;addRepo_Corebird deluge-torrent;addRepo_Deluge deluge-gtk;addRepo_Deluge kodi;addRepo_Kodi @@ -458,7 +469,6 @@ indicator-sound-switcher;addRepo_IndicatorSoundSwitcher krita;addRepo_Krita gimp-gmic;addRepo_Gimp gimp;addRepo_Gimp -geary;addRepo_Geary vidcutter;addRepo_Vidcutter oracle-java10-installer;addRepo_Java10 oracle-java10-set-default;addRepo_Java10 @@ -520,7 +530,43 @@ megasync;addRepo_MEGA lutris;addRepo_Lutris guake;addRepo_LinuxUprising_Guake winehq-stable;addRepo_WineHQ -balena-etcher-electron;addRepo_Belena" +flatpak;addRepo_flatpak +balena-etcher-electron;addRepo_Belena +font-manager;addRepo_FontManager +cawbird;addRepo_Cawbird +ubuntu-make;addRepo_UbuntuMake" + +# +# Ubuntu Make +# +function addRepo_UbuntuMake () { + addPPA ppa:ubuntu-desktop/ubuntu-make +} + +# +# Cawbird +# +function addRepo_Cawbird () { + addKey "https://download.opensuse.org/repositories/home:IBBoard:cawbird/xUbuntu_18.04/Release.key" + addRepo cawbird.list \ + "deb http://download.opensuse.org/repositories/home:/IBBoard:/cawbird/xUbuntu_18.04/ /" +} + +# +# Font Manager +# +function addRepo_FontManager () { + addPPA ppa:font-manager/staging +} + + +# +# Flatpak +# +function addRepo_flatpak () { + addPPA ppa:alexlarsson/flatpak +} + # # Belena Etcher @@ -537,6 +583,7 @@ function addRepo_Belena () { # Wine HQ # function addRepo_WineHQ () { + addPPA ppa:cybermax-dexter/sdl2-backport addKey "https://dl.winehq.org/wine-builds/winehq.key" addRepo winehq.list \ "deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main" @@ -718,14 +765,6 @@ function addRepo_Vidcutter () { addPPA ppa:ozmartian/apps } - -# -# Geary -# -function addRepo_Geary () { - addPPA ppa:geary-team/releases -} - # # Gimp / Gmic # @@ -761,13 +800,6 @@ function addRepo_Deluge () { addPPA ppa:deluge-team/ppa } -# -# Corebird -# -function addRepo_Corebird () { - addPPA ppa:ubuntuhandbook1/corebird -} - # # Sayonara # @@ -942,9 +974,10 @@ function addRepo_ChromeStable () { # Insync # function addRepo_Insync () { - addKey "https://d2t3ff60b2tol4.cloudfront.net/services@insynchq.com.gpg.key" + addKey "keyserver.ubuntu.com" \ + "ACCAF35C" addRepo insync.list \ - "deb http://apt.insynchq.com/ubuntu bionic non-free contrib" + "deb http://apt.insync.io/ubuntu bionic non-free contrib" } # @@ -1066,7 +1099,7 @@ function addRepo_AndroidStudio () { } #-----------------------------------------------------------------------------# -# Package pre install functions list # +# Package pre install functions list # #-----------------------------------------------------------------------------# # @@ -1118,10 +1151,76 @@ mongodb;mongodb_PostTrtFct qttools5-dev-tools;qt_PostTrtFct plank;plank_PostTrtFct androidstudio;android_PostTrtFct -nodejs8lts;nodejs8lts_PostTrtFct +nodejslts;nodejslts_PostTrtFct angularcli;angularcli_PostTrtFct dockerio;dockerio_PostTrtFct -megasync;megasync_PostTrtFct" +megasync;megasync_PostTrtFct +flatpak;flatpak_PostTrtFct +gcc8;gcc8_PostTrtFct +ruby-dev;ruby-dev_PostTrtFct" + +# +# NPM Update +# +function nodejslts_PostTrtFct () { + printf "[NPM] set prefix in ~/.local " + printf "\n[NPM] set prefix in ~/.local\n" &>> $logFile + npm config set prefix /home/$myHomedir/.local &>> $logFile + ret_code=$? + retCode $ret_code + + if [ `grep 'PATH=~/.local/bin/:$PATH' ~/.bashrc | wc -l` -gt 0 ]; then + printf "[NPM] add ~/.local/bin to PATH ... already added [ "$BOLDVERT"OK"$NORMAL" ] " + else + printf "[NPM] add ~/.local/bin to PATH " + printf "\n[NPM] add ~/.local/bin to PATH\n" &>> $logFile + echo 'PATH=~/.local/bin/:$PATH' | tee -a ~/.bashrc &>> $logFile + ret_code=$? + retCode $ret_code + fi + + printf "[NPM] update npm " + printf "\n[NPM] update npm\n" &>> $logFile + npm i -g npm &>> $logFile + ret_code=$? + retCode $ret_code +} + + +# +# GEM / Ruby Dev +# +function ruby-dev_PostTrtFct () { + printf "[GEM] update --system " + printf "\n[GEM] update --system\n" &>> $logFile + sudo gem update --system &>> $logFile + ret_code=$? + retCode $ret_code +} + +# +# GCC 8 +# +function gcc8_PostTrtFct () { + runCmd "sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-7 70 --slave /usr/bin/g++ g++ /usr/bin/g++-7 --slave /usr/bin/gcov gcov /usr/bin/gcov-7" \ + "adding GCC-7 as alternative" + runCmd "sudo update-alternatives --install /usr/bin/gcc gcc /usr/bin/gcc-8 80 --slave /usr/bin/g++ g++ /usr/bin/g++-8 --slave /usr/bin/gcov gcov /usr/bin/gcov-8" \ + "adding GCC-8 as alternative by default" +} + +# +# Flatpak +# +function flatpak_PostTrtFct () { + if which flatpak >/dev/null; then + printf "[FLATPAK] Adding Flathub repository " + printf "\n[FLATPAK] Adding Flathub repository\n" &>> $logFile + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo &>> $logFile + ret_code=$? + retCode $ret_code + fi +} + # # MEGASync @@ -1160,18 +1259,6 @@ function angularcli_PostTrtFct () { fi } -# -# NodeJS 8 LTS -# -function nodejs8lts_PostTrtFct () { - if which /usr/local/bin/node >/dev/null; then - runCmd "sudo rm /usr/local/bin/node" \ - "cleaning/removing legacy node files" - else - print "[INFO] nothing to clean, good :-)" - fi -} - # # Android Env for adb, fastboot, .... # diff --git a/vars.sh b/vars.sh index 92b68c0..e50801f 100644 --- a/vars.sh +++ b/vars.sh @@ -1,19 +1,19 @@ -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : see documentation or man pages # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# -#------------------------------------------------------------------------------# -# Script's cons. and vars. # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Script's cons. and vars. # +#-----------------------------------------------------------------------------# # # app version number # -version="0.5.1-b11" +version="0.5.2-b2" # # myHomedir is used in full paths to the homedir diff --git a/yggdrasil.sh b/yggdrasil.sh index 40a7b85..cc59814 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -1,11 +1,11 @@ #!/bin/bash -#------------------------------------------------------------------------------# -# Yggdrasil NG # -# compatibility : Mint 19, Ubuntu 18.04 # -# author : Francois B. (Makotosan/Shakasan) # -# licence : GPLv3 # -# website : https://makotonoblog.be/ # -#------------------------------------------------------------------------------# +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : Mint 19, Ubuntu 18.04 # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# # # include functions and vars from external files @@ -106,6 +106,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do installBoostnotes installTeamViewer13 installXnViewMP + installAppImageLauncher ;; f) # full install if [ $ygginitCount = false ]; then @@ -154,6 +155,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do installBoostnotes installTeamViewer13 installXnViewMP + installAppImageLauncher ;; c) # install themes and icons if [ $ygginitCount = false ]; then From 7ab46297ac8dc295349af1586aa7b63f52aa0f55 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 23 Feb 2020 17:26:12 +0100 Subject: [PATCH 189/261] user add to vboxusers group --- repo_functions_ub1804.sh | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index f0c8abf..efa98d4 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -326,8 +326,6 @@ tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq gpick;apt;dev;gpick virtualbox-6.1;apt;dev;virtualbox-6.1 -virtualbox-dkms;apt;dev;virtualbox-6.1 -libelf-dev;apt;dev;virtualbox-6.1 build-essential;apt;dev;build-essential ghex;apt;dev;ghex glade;apt;dev;glade @@ -1157,7 +1155,17 @@ dockerio;dockerio_PostTrtFct megasync;megasync_PostTrtFct flatpak;flatpak_PostTrtFct gcc8;gcc8_PostTrtFct -ruby-dev;ruby-dev_PostTrtFct" +ruby-dev;ruby-dev_PostTrtFct +virtualbox-6.1;virtualbox-6.1_PostTrtFct" + +# +# virtualbox-6.1 +# +function virtualbox-6.1_PostTrtFct () { + cUser=$(whoami) + runCmd "sudo adduser $cUser vboxusers" \ + "adding user to vboxusers group" +} # # NPM Update From 150ebb76fa9f60dbe4419dbbb3e68379acd5d32e Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 23 Feb 2020 19:09:36 +0100 Subject: [PATCH 190/261] first step for Ubuntu 20.04/LM20 integration --- yggdrasil.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/yggdrasil.sh b/yggdrasil.sh index cc59814..ab64b63 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -29,6 +29,11 @@ case $OS in source /opt/yggdrasil/install_functions_ub1804.sh || exit 1 source /opt/yggdrasil/menus_functions_ub1804.sh || exit 1 ;; + *"Ubuntu 20.04"* | *"Linux Mint 20"*) + source /opt/yggdrasil/repo_functions_ub2004.sh || exit 1 + source /opt/yggdrasil/install_functions_ub2004.sh || exit 1 + source /opt/yggdrasil/menus_functions_ub2004.sh || exit 1 + ;; *) printf "\n" printf $BOLDROUGE"Linux distro not supported"$NORMAL From 4faa0d7f1dce10161e7f92c7c1938aae90ff4df4 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Thu, 27 Feb 2020 23:11:49 +0100 Subject: [PATCH 191/261] upd --- .gitignore | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.gitignore b/.gitignore index 7985c5f..0ded962 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,6 @@ deb/* *.sync-conflict-* utils/* TODO.txt +repo_functions_ub2004.sh +menus_functions_ub2004.sh +install_functions_ub2004.sh \ No newline at end of file From 87952b7ba568680d15bc5c524ea2fae0d2b8ac72 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 28 Feb 2020 21:39:18 +0100 Subject: [PATCH 192/261] NodeJS upd to 12.x --- repo_functions_ub1804.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index efa98d4..5607488 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -911,8 +911,8 @@ function addRepo_SkypeForLinux () { function addRepo_NodeLts () { addKey "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" addRepo "nodesource.list" \ - "deb https://deb.nodesource.com/node_10.x bionic main" \ - "deb-src https://deb.nodesource.com/node_10.x bionic main" + "deb https://deb.nodesource.com/node_12.x bionic main" \ + "deb-src https://deb.nodesource.com/node_12.x bionic main" } # From 54a9b47c4cc07e134a40c56e6521033f50197ca7 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 28 Feb 2020 21:48:48 +0100 Subject: [PATCH 193/261] VBOX 6.1 repo bug fixed --- repo_functions_ub1804.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 5607488..612e2b0 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -430,7 +430,7 @@ docker-ce;addRepo_DockerCE ansible;addRepo_Ansible sublime-text;addRepo_SublimeText vivaldi-stable;addRepo_Vivaldi -virtualbox-6.0;addRepo_VirtualBox +virtualbox-6.1;addRepo_VirtualBox syncthing;addRepo_Syncthing syncthinggtk;addRepo_SyncthingGtk opera-stable;addRepo_Opera From d09222b3ffe469a7ffea98551c48b13f2312dcd7 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 28 Feb 2020 22:23:57 +0100 Subject: [PATCH 194/261] cleaning old repo --- repo_functions_ub1804.sh | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 612e2b0..ac90d0e 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -426,7 +426,6 @@ mongodb;addRepo_MongoDB_CE gyazo;addRepo_Gyazo code;addRepo_VSCode androidstudio;addRepo_AndroidStudio -docker-ce;addRepo_DockerCE ansible;addRepo_Ansible sublime-text;addRepo_SublimeText vivaldi-stable;addRepo_Vivaldi @@ -1031,15 +1030,6 @@ function addRepo_Ansible () { addPPA ppa:ansible/ansible } -# -# Docker CE -# -function addRepo_DockerCE () { - addKey "https://download.docker.com/linux/ubuntu/gpg" - addRepo "docker.list" \ - "deb [arch=amd64] https://download.docker.com/linux/ubuntu bionic stable" -} - # # Gyazo # From 57464ecf3bcbdf5d0e7ae50373abc3c0a282b797 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 18 Mar 2020 18:01:12 +0100 Subject: [PATCH 195/261] mongodb repo upd to 4.2 --- repo_functions_ub1804.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index ac90d0e..f088609 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1044,9 +1044,9 @@ function addRepo_Gyazo () { # MongoDB 4 CE # function addRepo_MongoDB_CE () { - addKey "https://www.mongodb.org/static/pgp/server-4.0.asc" - addRepo "mongodb-org-4.0.list" \ - "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.0 multiverse" + addKey "https://www.mongodb.org/static/pgp/server-4.2.asc" + addRepo "mongodb-org-4.2.list" \ + "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" } # From 0acf7f9149803aab9accdc74547cbc6005bc20f3 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 25 Apr 2020 22:13:54 +0200 Subject: [PATCH 196/261] fix missing entry in apps menu --- menus_functions_ub1804.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 005f4b7..c7cb477 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -348,6 +348,7 @@ function showAppInstallMenu () { "franz" "Franz multi IM app" \ "slack" "Slack App" \ "appimagelauncher" "AppImage Launcher" \ + "xnviewmp" "XNView MP" \ "Back" "Back" 3>&1 1>&2 2>&3) case $appsInstallMenuOptions in @@ -417,6 +418,9 @@ function showAppInstallMenu () { "appimagelauncher") installAppImageLauncherMenu ;; + "xnviewmp") + installXnViewMPMenu + ;; "Back") break ;; From 3db26b6deb070e57acb179e35a243e3c0d00ffc3 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 25 Apr 2020 22:34:11 +0200 Subject: [PATCH 197/261] nightly/beta removed --- menus_functions_ub1804.sh | 14 ------------- repo_functions_ub1804.sh | 4 ---- yggdrasil.sh | 42 ++++++++++++++++----------------------- 3 files changed, 17 insertions(+), 43 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index c7cb477..5ff8363 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -429,20 +429,6 @@ function showAppInstallMenu () { done } -# -# show menu to install beta apps from different categories -# -function showAppBetaInstallMenu () { - installBetaMenu -} - -# -# show menu to install nightly apps from different categories -# -function showAppNightlyInstallMenu () { - installNightlyMenu -} - # # show menu about install/config hardware # diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index f088609..8147c22 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -384,11 +384,7 @@ sqlparse;pip;atom;sqlparse flake8;pip;atom;flake8 autopep8;pip;atom;autopep8 htmlbeautifier;gem;atom;htmlbeautifier -kodi;apt;beta;kodi-beta -kodi;apt;nightly;kodi-nightly nitrogen;apt;nitrogen;nitrogen -firefox-trunk;apt;nightly;firefox-trunk -firefox-trunk-locale-fr;apt;nightly;firefox-trunk-locale-fr libreoffice;apt;office;libreoffice6 winehq-stable;apt;wine;winehq-stable winetricks;apt;wine;winetricks diff --git a/yggdrasil.sh b/yggdrasil.sh index ab64b63..1ace2cb 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -308,17 +308,15 @@ mainMenuOptions=$(whiptail \ 25 80 16 \ "1" "System update" \ "2" "Applications" \ -"3" "Applications (BETA)" \ -"4" "Applications (Nightly)" \ -"5" "Themes & Icons" \ -"6" "Dev Apps" \ -"7" "System Config" \ -"8" "Hardware" \ -"9" "System Tools" \ -"10" "Add Makoto no Blog repository" \ -"11" "Reboot this computer" \ -"12" "About Yggdrasil" \ -"13" "Quit" 3>&1 1>&2 2>&3) +"3" "Themes & Icons" \ +"4" "Dev Apps" \ +"5" "System Config" \ +"6" "Hardware" \ +"7" "System Tools" \ +"8" "Add Makoto no Blog repository" \ +"9" "Reboot this computer" \ +"10" "About Yggdrasil" \ +"11" "Quit" 3>&1 1>&2 2>&3) case $mainMenuOptions in "1") @@ -329,36 +327,30 @@ case $mainMenuOptions in showAppInstallMenu ;; "3") - installAppsFromListMenu beta - ;; - "4") - installAppsFromListMenu nightly - ;; - "5") showThemesInstallMenu ;; - "6") + "4") showDevInstallMenu ;; - "7") + "5") showConfigMenu; ;; - "8") + "6") showHardwareMenu ;; - "9") + "7") showSysToolsMenu ;; - "10") + "8") addRepo_Makoto ;; - "11") + "9") showRebootBoxMenu ;; - "12") + "10") showAboutBoxMenu ;; - "13") + "11") exit ;; esac # main menu From 53f5ac6b687ac2650ba5ae6ac6aa2bc215a449ef Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 25 Apr 2020 22:56:45 +0200 Subject: [PATCH 198/261] release ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index e50801f..e1ec9b6 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.2-b2" +version="0.5.2-b3" # # myHomedir is used in full paths to the homedir From 5c4e7817477f3c0abf9fa8040201612e6fcdc288 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 25 Apr 2020 23:49:58 +0200 Subject: [PATCH 199/261] menu entry bug fixed --- menus_functions_ub1804.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 5ff8363..5a82a36 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -223,7 +223,7 @@ function showDevInstallMenu () { "boostnotes" "Boostnotes Markdown wiki app" \ "compass" "MongoDB Compass GUI" \ "gitkraken" "Gitkraken git gui" \ - "Vagrant" "Vagrant" \ + "vagrant" "Vagrant" \ "Back" "Back" 3>&1 1>&2 2>&3) case $devInstallMenuOptions in From a5336c4663aff93585b4e3a94347fcbee97087e9 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 3 May 2020 19:00:18 +0200 Subject: [PATCH 200/261] aptik remove from 18.04 branch --- repo_functions_ub1804.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 8147c22..467c1bd 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -166,7 +166,6 @@ gparted;apt;utilities;gparted gsmartcontrol;apt;utilities;gsmartcontrol terminator;apt;utilities;terminator tilix;apt;utilities;tilix -aptik;apt;utilities;aptik gufw;apt;utilities;gufw numlockx;apt;utilities;numlockx grub-customizer;apt;utilities;grub-customizer @@ -443,7 +442,6 @@ skypeforlinux;addRepo_SkypeForLinux shotwell;addRepo_Shotwell peek;addRepo_Peek sqlitebrowser;addRepo_SQLiteBrowser -aptik;addRepo_Teejee2008 avidemux2.6-plugins-qt;addRepo_Avidemux2.6 avidemux2.6-qt;addRepo_Avidemux2.6 quiterss;addRepo_Quiterss @@ -857,7 +855,7 @@ function addRepo_Avidemux2.6 () { } # -# aptik, conky-manager, selene, timeshift +# conky-manager, selene, timeshift # function addRepo_Teejee2008 () { addPPA ppa:teejee2008/ppa From 67c155d652a3b7f6525c304cb50520187ebba355 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 3 May 2020 20:04:46 +0200 Subject: [PATCH 201/261] output display minor fix --- repo_functions_ub1804.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 467c1bd..e62b2dd 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1162,7 +1162,7 @@ function nodejslts_PostTrtFct () { retCode $ret_code if [ `grep 'PATH=~/.local/bin/:$PATH' ~/.bashrc | wc -l` -gt 0 ]; then - printf "[NPM] add ~/.local/bin to PATH ... already added [ "$BOLDVERT"OK"$NORMAL" ] " + printf "[NPM] add ~/.local/bin to PATH ... already added [ "$BOLDVERT"OK"$NORMAL" ]\n " else printf "[NPM] add ~/.local/bin to PATH " printf "\n[NPM] add ~/.local/bin to PATH\n" &>> $logFile From e1ab8e0766d20e015b7f75ec074c523f37f5f768 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 3 May 2020 20:07:13 +0200 Subject: [PATCH 202/261] minor fix in menu --- menus_functions_ub1804.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 5a82a36..0666a7b 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -464,6 +464,7 @@ function showHardwareMenu () { ;; "microcode") updateMicrocode + pressKey ;; "tlp") installAppsFromListMenu tlp From 3db9f46d7a44119304190a374aeff81feff274b5 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 22 May 2020 21:03:59 +0200 Subject: [PATCH 203/261] Minor upd of --- README.md | 22 +++++++++++++--------- 1 file changed, 13 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index b74b75e..616b60a 100644 --- a/README.md +++ b/README.md @@ -3,9 +3,7 @@ About ----- -__!! Warnings : this is a early beta version !!__ - -The purpose of this script is to provide a tool to install, customize and tweak a fresh installation of Linux Mint 19.x, Ubuntu 18.04 +The purpose of this script is to provide a tool to install, customize and tweak a fresh installation of Linux Mint / Ubuntu. The Linux Mint 18 / Ubuntu 16.04 branch is now removed since the 0.5.1 version of Yggdrasil. No bugs fixed, features or any changes will be made on this branch anymore. @@ -14,13 +12,10 @@ If you still need it, please use an older version from the repository at your ow Installation ------------ -Linux Mint 18 / Ubuntu 16.04 (Yggdrasil < 0.5.1) +Linux Mint 20 / Ubuntu 20.04 (Yggdrasil >= 0.5.1) ```shell -curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - -echo "deb https://packagecloud.io/makoto/stable/ubuntu/ xenial main" | sudo tee /etc/apt/sources.list.d/makoto.list -sudo apt-get update -sudo apt-get install yggdrasil +# coming soon ``` Linux Mint 19 / Ubuntu 18.04 (Yggdrasil >= 0.5.1) @@ -32,13 +27,22 @@ sudo apt-get update sudo apt-get install yggdrasil ``` +Linux Mint 18 / Ubuntu 16.04 (Yggdrasil < 0.5.1) + +```shell +curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - +echo "deb https://packagecloud.io/makoto/stable/ubuntu/ xenial main" | sudo tee /etc/apt/sources.list.d/makoto.list +sudo apt-get update +sudo apt-get install yggdrasil +``` + Credits ------- This script has been written by Francois B. (Makotosan) * Email : francois@makotonoblog.be -* Website : https://makotonoblog.be/ +* Website : https://makotonoblog.be/yggdrasil/ Licence ------- From 1bfb9581e512d702d5600768ec8c813cfd4215b1 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 22 May 2020 22:56:27 +0200 Subject: [PATCH 204/261] auto uninstall unused dep while flatpak upd --- core_functions.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/core_functions.sh b/core_functions.sh index fc489ee..1246a66 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -182,6 +182,12 @@ function updateSystem () { sudo flatpak update -y &>> $logFile ret_code=$? retCode $ret_code + + printf "[FLATPAK] uninstall --unused " + printf "\n[FLATPAK] uninstall --unused\n" &>> $logFile + sudo flatpak uninstall --unused -y &>> $logFile + ret_code=$? + retCode $ret_code fi repoAdded=0 From d73f99a2a9bc62845940fba5342ebe9ccb003d13 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 22 May 2020 23:16:33 +0200 Subject: [PATCH 205/261] 1st commit addind Ubuntu 20.04 support (0.6.0-b1) --- .gitignore | 3 - install_functions_ub2004.sh | 236 +++++++ menus_functions_ub2004.sh | 486 ++++++++++++++ repo_functions_ub2004.sh | 1254 +++++++++++++++++++++++++++++++++++ vars.sh | 2 +- 5 files changed, 1977 insertions(+), 4 deletions(-) create mode 100644 install_functions_ub2004.sh create mode 100644 menus_functions_ub2004.sh create mode 100644 repo_functions_ub2004.sh diff --git a/.gitignore b/.gitignore index 0ded962..7985c5f 100644 --- a/.gitignore +++ b/.gitignore @@ -5,6 +5,3 @@ deb/* *.sync-conflict-* utils/* TODO.txt -repo_functions_ub2004.sh -menus_functions_ub2004.sh -install_functions_ub2004.sh \ No newline at end of file diff --git a/install_functions_ub2004.sh b/install_functions_ub2004.sh new file mode 100644 index 0000000..5de9195 --- /dev/null +++ b/install_functions_ub2004.sh @@ -0,0 +1,236 @@ +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# # +# Ubuntu 20.04 / Linux Mint 20 # +# # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# install functions # +#-----------------------------------------------------------------------------# + +# +# Viber (headless) +# +function installViber () { + installPackageDpkg http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb \ + viber.deb \ + no +} + +# +# Viber (Menu) +# +function installViberMenu () { + installPackageDpkg http://download.cdn.viber.com/cdn/desktop/Linux/viber.deb \ + viber.deb \ + yes +} + +# +# Franz (headless) +# +function installFranz () { + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.4.0/franz_5.4.0_amd64.deb \ + franz.deb \ + no +} + +# +# Franz (Menu) +# +function installFranzMenu () { + installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.4.0/franz_5.4.0_amd64.deb \ + franz.deb \ + yes +} + +# +# Slack (headless) +# +function installSlack () { + installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-4.4.2-amd64.deb \ + slack.deb \ + no +} + +# +# Slack (Menu) +# +function installSlackMenu () { + installPackageDpkg https://downloads.slack-edge.com/linux_releases/slack-desktop-4.4.2-amd64.deb \ + slack.deb \ + yes +} + +# +# XnViewMP (headless) +# +function installXnViewMP () { + installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ + xnviewmp.deb \ + no +} + +# +# XnViewMP (Menu) +# +function installXnViewMPMenu () { + installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ + xnviewmp.deb \ + yes +} + +# +# update AMD/Intel CPU Microcode +# +function updateMicrocode () { + msg "CPU Microcode updating" + oldMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` + intel=`cat /proc/cpuinfo | grep -i Intel | wc -l` + amd=`cat /proc/cpuinfo | grep -i Amd | wc -l` + if [ "$intel" -gt "0" ]; then + installPackage apt intel-microcode + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` + printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" + elif [ "$amd" -gt "0" ]; then + installPackage apt amd64-microcode + newMicrocode=`cat /proc/cpuinfo | grep -i --color microcode -m 1 | awk -F': ' '{print $2}'` + printf "[INFO] Microcode updated from "$oldMicrocode" version to "$newMicrocode" version" + else + printf "[INFO] No Intel/AMD CPU found" + fi + printf "\n" +} + +# +# fix some config issue with Intel Wireless 6320 cards +# +function fixWirelessIntel6320 () { + runCmd "sudo cp /etc/modprobe.d/iwlwifi.conf /etc/modprobe.d/iwlwifi.conf.bak" \ + "backing up config file" + runCmd "echo options iwlwifi bt_coex_active=0 swcrypto=1 11n_disable=8 | sudo tee /etc/modprobe.d/iwlwifi.conf" \ + "applying new config" + printf "[INFO] reboot required !!!" + printf "\n" +} + +# +# Key-ID USB Fido U2F device udev rules +# +function installKeyIDuDev () { + printf "[CMD] Adding Key-ID device UDEV rules " + +cat << EOF | sudo tee /etc/udev/rules.d/70-u2f.rules +# this udev file should be used with udev 188 and newer\n\ +ACTION!="add|change", GOTO="u2f_end" + +# Key-ID FIDO U2F +KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="096e", ATTRS{idProduct}=="0850|0880", TAG+="uaccess" + +LABEL="u2f_end" +EOF + + ret_code=$? + retCode $ret_code + + runCmd "sudo service udev restart" \ + "restarting UDEV service" +} + +# +# install Teamviewer 13 (headless) +# +function installTeamViewer13 () { + installPackageDpkg https://download.teamviewer.com/download/linux/teamviewer_amd64.deb \ + teamviewer13.deb \ + no +} + +# +# install Teamviewer 13 (Menu) +# +function installTeamViewer13Menu () { + installPackageDpkg https://download.teamviewer.com/download/linux/teamviewer_amd64.deb \ + teamviewer13.deb \ + yes +} + +# +# install Compass (headless) +# +function installCompass () { + installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.20.5_amd64.deb \ + compass.deb \ + no +} + +# +# install Compass (Menu) +# +function installCompassMenu () { + installPackageDpkg https://downloads.mongodb.com/compass/mongodb-compass_1.20.5_amd64.deb \ + compass.deb \ + yes +} + +# +# Boostnotes (headless) +# +function installBoostnotes () { + installPackageDpkg https://github.com/BoostIO/BoostNote.next/releases/download/v0.4.1/boost-note-linux.deb \ + boostnotes.deb \ + no +} + +# +# Boostnotes (Menu) +# +function installBoostnotesMenu () { + installPackageDpkg https://github.com/BoostIO/BoostNote.next/releases/download/v0.4.1/boost-note-linux.deb \ + boostnotes.deb \ + yes +} + +# +# Vagrant (headless) +# +function installVagrant () { + installPackageDpkg https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb \ + vagrant.deb \ + no +} + +# +# Vagrant (Menu) +# +function installVagrantMenu () { + installPackageDpkg https://releases.hashicorp.com/vagrant/2.2.7/vagrant_2.2.7_x86_64.deb \ + vagrant.deb \ + yes +} + +# +# AppImage Launcher (headless) +# +function installAppImageLauncher () { + installPackageDpkg https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.1.3/appimagelauncher_2.1.3-travis975.7408819.bionic_amd64.deb \ + appimagelauncher.deb \ + no +} + +# +# AppImage Launcher (Menu) +# +function installAppImageLauncherMenu () { + installPackageDpkg https://github.com/TheAssassin/AppImageLauncher/releases/download/v2.1.3/appimagelauncher_2.1.3-travis975.7408819.bionic_amd64.deb \ + appimagelauncher.deb \ + yes +} \ No newline at end of file diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh new file mode 100644 index 0000000..de3ade1 --- /dev/null +++ b/menus_functions_ub2004.sh @@ -0,0 +1,486 @@ +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# # +# Ubuntu 20.04 / Linux Mint 20 # +# # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# menus functions # +#-----------------------------------------------------------------------------# + +# +# show about dialog box +# +function showAboutBoxMenu () { +whiptail \ +--title "About" \ +--msgbox "\n + Author : Francois B. (Makotosan) + Email : shakasan@sirenacorp.be +Website : https://makotonoblog.be/ + Github : https://github.com/shakasan/yggdrasil_ng +Licence : GPLv3 +Version : $version\n +At the beginning, this script has been written to makes my life easier when I have to (re)install my personal computers ;-) +Advices and remarks are welcome ^^" \ +20 80 +} + +# +# show reboot menu +# +function showRebootBoxMenu () { + if (whiptail \ + --title "Yggdrasil $version - WARNING - ReBoot" \ + --yesno "Are you sure to reboot this computer ?" \ + 7 42) then + sudo reboot + fi +} + +# +# show menu to config system +# +function showConfigMenu () { + while true; do + + configMenuOptions=$(whiptail \ + --title "Yggdrasil $version - System Config" \ + --menu "System Config" \ + 25 80 16 \ + "Ufw" "Enable Firewall (ufw)" \ + "NumLockX" "NumLock Enabled at boot time" \ + "TmpRAM" "/tmp stored in RAM" \ + "screenfetch" "screenfetch added to .bashrc" \ + "historyTS" "TimeStamp enabled in Shell History" \ + "unattendedUpgrades" "Enable automatic security updates" \ + "Unbound" "Enable Unbound DNS Cache server" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $configMenuOptions in + "Ufw") + clear + enableUFW + pressKey + ;; + "NumLockX") + clear + enableNumLockX + pressKey + ;; + "TmpRAM") + clear + enableTmpRAM + pressKey + ;; + "screenfetch") + clear + addScreenfetchBashrc + pressKey + ;; + "historyTS") + clear + enableHistoryTS + pressKey + ;; + "unattendedUpgrades") + clear + installUnattendedUpgrades + pressKey + ;; + "Unbound") + clear + installAppsFromList unbound + pressKey + ;; + "Back") + break + ;; + esac + + done +} + +# +# show menu to install system tools +# +function showSysToolsMenu () { + while true; do + + sysToolsMenuOptions=$(whiptail \ + --title "Yggdrasil $version - System Tools" \ + --menu "System tools to diagnose and optimize" \ + 25 80 16 \ + "inxi" "System informations" \ + "speedtest-cli" "Bandwidth test" \ + "packetloss" "Packetloss test (ping)" \ + "OptimizeFirefox" "Firefox SQLite databases optimization" \ + "Autoremove" "Remove useless Deb packages" \ + "CleanOldKernels" "Removing old kernels (keep 2 last kernels)" \ + "SoundCardsDetection" "Sound Cards Detection" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $sysToolsMenuOptions in + "inxi") + clear; toolInxi; pressKey + ;; + "speedtest-cli") + clear; toolSpeedtestCli; pressKey + ;; + "packetloss") + clear; toolPacketLoss; pressKey + ;; + "OptimizeFirefox") + clear; toolOptimizeFirefox; pressKey + ;; + "Autoremove") + clear; toolAutoremove; pressKey + ;; + "CleanOldKernels") + clear; toolClearOldKernels; pressKey + ;; + "SoundCardsDetection") + clear; toolSoundCardsDetection; pressKey + ;; + "Back") + break + ;; + esac + + done +} + +# +# show menu to install themes/icons +# +function showThemesInstallMenu () { + while true; do + + themesInstallMenuOptions=$(whiptail \ + --title "Yggdrasil $version - Themes/Icons Install" \ + --menu "Install themes/icons from different submenus" \ + 25 80 16 \ + "themes" "GTK themes" \ + "icons" "Icons" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $themesInstallMenuOptions in + "themes") + installAppsFromListMenu gtkthemes + ;; + "icons") + installAppsFromListMenu icons + ;; + "Back") + break + ;; + esac + + done +} + +# +# show menu to install dev apps +# +function showDevInstallMenu () { + while true; do + + devInstallMenuOptions=$(whiptail \ + --title "Yggdrasil $version - Dev Install" \ + --menu "Install Dev apps from different submenus" \ + 25 80 16 \ + "devbase" "dev apps and tools" \ + "java11" "OpenJDK Java 11 dev env" \ + "javascript" "JavaScript dev env" \ + "mongodbce" "MongoDB CE" \ + "php" "PHP dev env" \ + "lua" "Lua dev env" \ + "ruby" "Ruby dev env" \ + "qt" "QT dev env" \ + "python" "Python dev env" \ + "atom" "Atom" \ + "anjuta" "Anjuta" \ + "brackets" "Brackets" \ + "codeblocks" "CodeBlocks" \ + "geany" "Geany" \ + "idea" "Idea" \ + "eclipse" "Eclipse" \ + "pycharmprofessional" "PyCharm Professional edition" \ + "pycharmcommunity" "PyCharm Community edition" \ + "vsc" "Visual Studio Code" \ + "androidstudio" "Android Studio" \ + "sublimetext" "Sublime Text" \ + "cad" "CAD tools" \ + "teamviewer13" "Teamviewer 13" \ + "boostnotes" "Boostnotes Markdown wiki app" \ + "compass" "MongoDB Compass GUI" \ + "gitkraken" "Gitkraken git gui" \ + "vagrant" "Vagrant" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $devInstallMenuOptions in + "devbase") + installAppsFromListMenu dev + ;; + "java11") + installAppsFromListMenu java11 + ;; + "javascript") + installAppsFromListMenu javascript + ;; + "mongodbce") + installAppsFromListMenu mongodb + ;; + "php") + installAppsFromListMenu php + ;; + "lua") + installAppsFromListMenu lua + ;; + "ruby") + installAppsFromListMenu ruby + ;; + "qt") + installAppsFromListMenu qt + ;; + "python") + installAppsFromListMenu python + ;; + "atom") + installAppsFromListMenu atom + ;; + "anjuta") + installAppsFromListMenu anjuta + ;; + "brackets") + installAppsFromListMenu brackets + ;; + "codeblocks") + installAppsFromListMenu codeblocks + ;; + "geany") + installAppsFromListMenu geany + ;; + "idea") + installAppsFromListMenu idea + ;; + "eclipse") + installAppsFromListMenu eclipse + ;; + "pycharmprofessional") + installAppsFromListMenu pycharm-professional + ;; + "pycharmcommunity") + installAppsFromListMenu pycharm-community + ;; + "vsc") + installAppsFromListMenu code + ;; + "androidstudio") + installAppsFromListMenu androidstudio + ;; + "sublimetext") + installAppsFromListMenu sublime-text + ;; + "cad") + installAppsFromListMenu cad + ;; + "teamviewer13") + installTeamViewer13Menu + ;; + "boostnotes") + installBoostnotesMenu + ;; + "compass") + installCompassMenu + ;; + "gitkraken") + installAppsFromListMenu gitkraken + ;; + "vagrant") + installVagrantMenu + ;; + "Back") + break + ;; + esac + + done +} + +# +# show menu to install apps from different categories +# +function showAppInstallMenu () { + while true; do + + appsInstallMenuOptions=$(whiptail \ + --title "Yggdrasil $version - Apps Install" \ + --menu "Install apps from different submenus" \ + 25 80 16 \ + "base" "Base Apps" \ + "office" "Office Apps" \ + "multimedia" "Multimedia Apps" \ + "ebook" "eBook Apps" \ + "internet" "Internet Apps" \ + "utilities" "Misc Utilities" \ + "games" "Games & tools" \ + "steam" "Steam" \ + "burningtools" "Disc Burning and tools" \ + "nettools" "Network tools" \ + "cajaplugins" "Caja Plugins" \ + "nautilus" "Nautilus and plugins" \ + "thunar" "Thunar file manager" \ + "gimp" "Gimp plugins" \ + "rhythmbox" "RhythmBox plugins" \ + "pidgin" "Pidgin plugins" \ + "nitrogen" "Nitrogen WP Manager" \ + "wine" "Wine Builds" \ + "viber" "Viber IM desktop app" \ + "franz" "Franz multi IM app" \ + "slack" "Slack App" \ + "appimagelauncher" "AppImage Launcher" \ + "xnviewmp" "XNView MP" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $appsInstallMenuOptions in + "base") + installAppsFromListMenu base + ;; + "office") + installAppsFromListMenu office + ;; + "multimedia") + installAppsFromListMenu multimedia + ;; + "ebook") + installAppsFromListMenu ebook + ;; + "internet") + installAppsFromListMenu internet + ;; + "utilities") + installAppsFromListMenu utilities + ;; + "games") + installAppsFromListMenu games + ;; + "steam") + installAppsFromListMenu steam + ;; + "burningtools") + installAppsFromListMenu burningtools + ;; + "nettools") + installAppsFromListMenu nettools + ;; + "cajaplugins") + installAppsFromListMenu cajaplugins + ;; + "nautilus") + installAppsFromList nautilus + ;; + "thunar") + installAppsFromListMenu thunar + ;; + "gimp") + installAppsFromListMenu gimp + ;; + "rhythmbox") + installAppsFromListMenu rhythmbox + ;; + "pidgin") + installAppsFromListMenu pidgin + ;; + "nitrogen") + installAppsFromListMenu nitrogen + ;; + "wine") + installAppsFromListMenu wine + ;; + "viber") + installViberMenu + ;; + "franz") + installFranzMenu + ;; + "slack") + installSlackMenu + ;; + "appimagelauncher") + installAppImageLauncherMenu + ;; + "xnviewmp") + installXnViewMPMenu + ;; + "Back") + break + ;; + esac + + done +} + +# +# show menu about install/config hardware +# +function showHardwareMenu () { + while true; do + + hardwareMenuOptions=$(whiptail \ + --title "Yggdrasil $version - System Tools" \ + --menu "System tools to diagnose and optimize" \ + 25 80 16 \ + "HWE" "Ubuntu Hardware Enablement Stack (newer kernel+xorg)" \ + "cardreader" "Apps/tools needed for cardreaders" \ + "solaar" "Solaar for Logitech Unifying devices" \ + "webcam" "Install webcam neede apps" \ + "microcode" "Update Intel/AMD CPU microcode" \ + "tlp" "Install/Enable TLP for better power management " \ + "keyid" "Add udev rules for Key-ID FIDO U2F usb key" \ + "WI6320" "Fix Intel Wireless 6320 card config problem" \ + "Back" "Back" 3>&1 1>&2 2>&3) + + case $hardwareMenuOptions in + "HWE") + installAppsFromListMenu hwe + ;; + "cardreader") + installAppsFromListMenu cardreader + ;; + "solaar") + installAppsFromListMenu solaar + ;; + "webcam") + installAppsFromListMenu webcam + ;; + "microcode") + updateMicrocode + pressKey + ;; + "tlp") + installAppsFromListMenu tlp + ;; + "keyid") + installKeyIDuDev + pressKey + ;; + "WI6320") + fixWirelessIntel6320 + pressKey + ;; + "Back") + break + ;; + esac + + done +} diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh new file mode 100644 index 0000000..0c247b6 --- /dev/null +++ b/repo_functions_ub2004.sh @@ -0,0 +1,1254 @@ +#-----------------------------------------------------------------------------# +# Yggdrasil NG # +# compatibility : see documentation or man pages # +# author : Francois B. (Makotosan/Shakasan) # +# licence : GPLv3 # +# website : https://makotonoblog.be/ # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# # +# Ubuntu 20.04 / Linux Mint 20 # +# # +#-----------------------------------------------------------------------------# + +#-----------------------------------------------------------------------------# +# list of apps with required package manager and category # +#-----------------------------------------------------------------------------# + +# +# List of packages available +# fields : package name, package manager, category, unique ID for external functions +# +Apps="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 +python3-pip;apt;init;python3-pip +python3-distutils;apt;init;python3-distutils +pip;pip;init;setuptools +setuptools;pip;init;setuptools +cifs-utils;apt;base;cifs-utils +xterm;apt;base;xterm +curl;apt;base;curl +mc;apt;base;mc +bmon;apt;base;bmon +htop;apt;base;htop +screen;apt;base;screen +dconf-cli;apt;base;dconf +dconf-editor;apt;base;dconf-editor +lnav;apt;base;lnav +exfat-fuse;apt;base;exfat-fuse +exfat-utils;apt;base;exfat-utils +iftop;apt;base;iftop +iptraf;apt;base;iptraf +mpg123;apt;base;mpg123 +debconf-utils;apt;base;debconf-utils +idle3-tools;apt;base;idle3-tools +sysstat;apt;base;sysstat +dcfldd;apt;base;dcfldd +mdadm;apt;base;mdadm +ncdu;apt;base;ncdu +spotify;snap;multimedia;spotify +qmmp;apt;multimedia;qmmp +shotcut;snap;multimedia;shotcut +audacious;apt;multimedia;audacious +dia;apt;multimedia;dia +mpv;apt;multimedia;mpv +picard;apt;multimedia;picard +inkscape;apt;multimedia;inkscape +audacity;apt;multimedia;audacity +blender;apt;multimedia;blender +kodi;apt;multimedia;kodi +digikam;apt;multimedia;digikam +synfigstudio;apt;multimedia;synfigstudio +mkvtoolnix-gui;apt;multimedia;mkvtoolnix-gui +rawtherapee;apt;multimedia;rawtherapee +hugin;apt;multimedia;hugin +asunder;apt;multimedia;asunder +milkytracker;apt;multimedia;milkytracker +pitivi;apt;multimedia;pitivi +openshot;apt;multimedia;openshot +smplayer;apt;multimedia;smplayer +smplayer-themes;apt;multimedia;smplayer-themes +smplayer-l10n;apt;multimedia;smplayer-l10n +handbrake-cli;apt;multimedia;handbrake-cli +handbrake;apt;multimedia;handbrake +avidemux2.7-qt5;apt;multimedia;avidemux2.7-qt5 +avidemux2.7-plugins-settings;apt;multimedia;avidemux2.7-plugins-settings +mjpegtools;apt;multimedia;mjpegtools +twolame;apt;multimedia;twolame +lame;apt;multimedia;lame +gpicview;apt;multimedia;gpicview +vlc;apt;multimedia;vlc +shotwell;apt;multimedia;shotwell +darktable;apt;multimedia;darktable +ffmpeg;apt;multimedia;ffmpeg +scribus;apt;multimedia;scribus +gnome-font-viewer;apt;multimedia;gnome-font-viewer +moc;apt;multimedia;moc +webp;apt;multimedia;webp +cuetools;apt;multimedia;cuetools +shntool;apt;multimedia;shntool +flac;apt;multimedia;flac +entangle;apt;multimedia;entangle +krita;apt;multimedia;krita +soundconverter;apt;multimedia;soundconverter +gimp;apt;multimedia;gimp +quodlibet;apt;multimedia;quodlibet +peek;apt;multimedia;peek +bino;apt;multimedia;bino +kdenlive;apt;multimedia;kdenlive +com.github.huluti.ImCompressor;flatpak;multimedia;ImCompressor +flacon;apt;multimedia;flacon +simplescreenrecorder;apt;multimedia;simplescreenrecorder +selene;apt;multimedia;selene +vidcutter;snap;multimedia;vidcutter +syncthing;apt;internet;syncthing +syncthing-gtk;apt;internet;syncthinggtk +insync;apt;internet;insync +megasync;apt;internet;megasync +megacmd;apt;internet;megacmd +discord;snap;internet;discord +com.teamspeak.TeamSpeak;flatpak;internet;TeamSpeak +quiterss;apt;internet;quiterss +opera-stable;apt;internet;opera-stable +google-chrome-stable;apt;internet;google-chrome-stable +chromium-browser;apt;internet;chromium-browser +chromium-browser-l10n;apt;internet;chromium-browser-l10n +filezilla;apt;internet;filezilla +hexchat;apt;internet;hexchat +mumble;apt;internet;mumble +org.gnome.Geary;flatpak;internet;geary +birdtray;apt;internet;birdtray +telegram;apt;internet;telegram +skypeforlinux;apt;internet;skypeforlinux +nextcloud-desktop;apt;internet;nextcloud-desktop +deluge-gtk;apt;internet;deluge-gtk +vivaldi-stable;apt;internet;vivaldi-stable +transmission-gtk;apt;internet;transmission-gtk +youtube-dl;pip;internet;youtube-dl +gallery-dl;pip;internet;gallery-dl +cawbird;apt;internet;cawbird +qtqr;apt;utilities;qtqr +cpu-g;apt;utilities;cpu-g +screenfetch;apt;utilities;screenfetch +xcalib;apt;utilities;xcalib +conky-all;apt;utilities;conky-all +plank;apt;utilities;plank +indicator-sound-switcher;apt;utilities;indicator-sound-switcher +y-ppa-manager;apt;utilities;y-ppa-manager +synapse;apt;utilities;synapse +acetoneiso;apt;utilities;acetoneiso +guake;apt;utilities;guake +tilda;apt;utilities;tilda +psensor;apt;utilities;psensor +kazam;apt;utilities;kazam +bleachbit;apt;utilities;bleachbit +gparted;apt;utilities;gparted +gsmartcontrol;apt;utilities;gsmartcontrol +terminator;apt;utilities;terminator +tilix;apt;utilities;tilix +gufw;apt;utilities;gufw +numlockx;apt;utilities;numlockx +grub-customizer;apt;utilities;grub-customizer +zim;apt;utilities;zim +diodon;apt;utilities;diodon +qt5ct;apt;utilities;qt5ct +byobu;apt;utilities;byobu +mupdf;apt;utilities;mupdf +mupdf-tools;apt;utilities;mupdf-tools +pdfarranger;apt;utilities;pdfarranger +fcrackzip;apt;utilities;fcrackzip +rarcrack;apt;utilities;rarcrack +pdfcrack;apt;utilities;pdfcrack +figlet;apt;utilities;figlet +alltray;apt;utilities;alltray +kdocker;apt;utilities;kdocker +cheat;pip;utilities;cheat +screenkey;apt;utilities;screenkey +pdfgrep;apt;utilities;pdfgrep +coinmon;npm;utilities;coinmon +tldr;pip;utilities;tldr +fdupes;apt;utilities;fdupes +balena-etcher-electron;apt;utilities;balena-etcher-electron +org.gabmus.hydrapaper;flatpak;utilities;hydrapaper +nvme-cli;apt;utilities;nvme-cli +translatium;snap;utilities;translatium +font-manager;apt;utilities;font-manager +gyazo;apt;utilities;gyazo +woeusb;apt;utilities;woeusb +python3-dev;apt;python;python3-dev +python3-pyqt5;apt;python;python3-pyqt5 +pyqt5-dev-tools;apt;python;pyqt5-dev-tools +PyOpenGL;pip;python;PyOpenGL +tweepy;pip;python;tweepy +weppy;pip;python;weppy +py-term;pip;python;py-term +idle3;apt;python;idle3 +python-gi;apt;python;python-gi +python-gi-cairo;apt;python;python-gi-cairo +python3-gi;apt;python;python3-gi +python3-gi-cairo;apt;python;python3-gi-cairo +python3-venv;apt;python;python3-venv +python3-wheel;apt;python;python3-wheel +libgirepository1.0-dev;apt;python;libgirepository1.0-dev +libbz2-dev;apt;python;libbz2-dev +libreadline-dev;apt;python;libreadline-dev +libssl-dev;apt;python;libssl-dev +zlib1g-dev;apt;python;zlib1g-dev +libsqlite3-dev;apt;python;libsqlite3-dev +llvm;apt;python;llvm +libncurses5-dev;apt;python;libncurses5-dev +libncursesw5-dev;apt;python;libncursesw5-dev +xz-utils;apt;python;xz-utils +tk-dev;apt;python;tk-dev +libcairo2-dev;apt;python;libcairo2-dev +virtualenv;pip;python;virtualenv +pipenv;pip;python;pipenv +jstest-gtk;apt;games;jstest-gtk +dosbox;apt;games;dosbox +lutris;apt;games;lutris +steam;apt;steam;steam +brasero;apt;burningtools;brasero +k3b;apt;burningtools;k3b +k3b-extrathemes;apt;burningtools;k3b-extrathemes +xfburn;apt;burningtools;xfburn +whois;apt;nettools;whois +iptraf;apt;nettools;iptraf +iperf;apt;nettools;iperf +wireshark;apt;nettools;wireshark +tshark;apt;nettools;tshark +dsniff;apt;nettools;dsniff +aircrack-ng;apt;nettools;aricrack-ng +SpoofMAC;pip;nettools;SpoofMAC +speedtest-cli;pip;nettools;speedtest-cli +nethogs;apt;nettools;nethogs +ssh_scan;gem;nettools;sshscan +whatismyip;npm;nettools;whatismyip +caja-share;apt;cajaplugins;caja-share +caja-wallpaper;apt;cajaplugins;caja-wallpaper +caja-sendto;apt;cajaplugins;caka-sendto +caja-image-converter;apt;cajaplugins;caja-image-converter +insync-caja;apt;cajaplugins;insync-caja +nautilus;apt;nautilus;nautilus +file-roller;apt;nautilus;file-roller +nautilus-image-converter;apt;nautilus;nautilus-image-converter +nautilus-sendto;apt;nautilus;nautilus-sendto +nautilus-share;apt;nautilus;nautilus-share +nautilus-wipe;apt;nautilus;nautilus-wipe +nautilus-script-audio-convert;apt;nautilus;nautilus-script-audio-convert +nautilus-filename-repairer;apt;nautilus;filename-repairer +nautilus-gtkhash;apt;nautilus;nautilus-gtkhash +nautilus-ideviceinfo;apt;nautilus;nautilus-ideviceinfo +ooo-thumbnailer;apt;nautilus;ooo-thumbnailer +nautilus-dropbox;apt;nautilus;nautilus-dropbox +nautilus-script-manager;apt;nautilus;nautilus-script-manager +insync-nautilus;apt;nautilus;insync-nautilus +thunar;apt;thunar;thunar +thunar-archive-plugin;apt;thunar;thunar-archive-plugin +thunar-gtkhash;apt;thunar;thunar-gtkhash +thunar-volman;apt;thunar;thunar-volman +gtkam-gimp;apt;gimp;gtkam-gimp +gimp-gluas;apt;gimp;gimp-gluas +gimp-data-extras;apt;gimp;gimp-data-extras +gimp-lensfun;apt;gimp;gimp-lensfun +gimp-gmic;apt;gimp;gimp-gmic +gimp-texturize;apt;gimp;gimp-texturize +rhythmbox-plugin-alternative-toolbar;apt;rhythmbox;rhythmbox-plugin-alternative-toolbar +rhythmbox-plugin-artdisplay;apt;rhythmbox;rhythmbox-plugin-artdisplay +rhythmbox-plugin-cdrecorder;apt;rhythmbox;rhythmbox-plugin-cdrecorder +rhythmbox-plugin-close-on-hide;apt;rhythmbox;rhythmbox-plugin-close-on-hide +rhythmbox-plugin-countdown-playlist;apt;rhythmbox;rhythmbox-plugin-countdown-playlist +rhythmbox-plugin-desktopart;apt;rhythmbox;rhythmbox-plugin-desktopart +rhythmbox-plugin-equalizer;apt;rhythmbox;rhythmbox-plugin-equalizer +rhythmbox-plugin-fullscreen;apt;rhythmbox;rhythmbox-plugin-fullscreen +rhythmbox-plugin-hide;apt;rhythmbox;rhythmbox-plugin-hide +rhythmbox-plugin-jumptowindow;apt;rhythmbox;rhythmbox-plugin-jumptowindow +rhythmbox-plugin-llyrics;apt;rhythmbox;rhythmbox-plugin-llyrics +rhythmbox-plugin-looper;apt;rhythmbox;rhythmbox-plugin-looper +rhythmbox-plugin-opencontainingfolder;apt;rhythmbox;rhythmbox-plugin-opencontainingfolder +rhythmbox-plugin-parametriceq;apt;rhythmbox;rhythmbox-plugin-parametriceq +rhythmbox-plugin-playlist-import-export;apt;rhythmbox;rhythmbox-plugin-playlist +rhythmbox-plugin-podcast-pos;apt;rhythmbox;rhythmbox-plugin-podcast-pos +rhythmbox-plugin-randomalbumplayer;apt;rhythmbox;rhythmbox-plugin-randomalbumplayer +rhythmbox-plugin-rating-filters;apt;rhythmbox;rhythmbox-plugin-rating-filters +rhythmbox-plugin-remembertherhythm;apt;rhythmbox;rhythmbox-plugin-remembertherhythm +rhythmbox-plugin-repeat-one-song;apt;rhythmbox;rhythmbox-plugin-repeat-one-song +rhythmbox-plugin-rhythmweb;apt;rhythmbox;rhythmbox-plugin-rhythmweb +rhythmbox-plugin-screensaver;apt;rhythmbox;rhythmbox-plugin-screensaver +rhythmbox-plugin-smallwindow;apt;rhythmbox;rhythmbox-plugin-smallwindow +rhythmbox-plugin-spectrum;apt;rhythmbox;rhythmbox-plugin-spectrum +rhythmbox-plugin-suspend;apt;rhythmbox;rhythmbox-plugin-suspend +rhythmbox-plugin-wikipedia;apt;rhythmbox;rhythmbox-plugin-wikipedia +rhythmbox-plugins;apt;rhythmbox;rhythmbox-plugins +unbound;apt;unbound;unbound +arc-theme;apt;gtkthemes;arc-theme +numix-gtk-theme;apt;gtkthemes;numix-gtk-theme +numix-blue-gtk-theme;apt;gtkthemes;numix-blue-gtk-theme +plata-theme;apt;gtkthemes;plata-theme +faenza-icon-theme;apt;icons;faenza-icon-theme +numix-icon-theme;apt;icons;numix-icon-theme +numix-icon-theme-circle;apt;icons;numix-icon-theme-circle +solaar;apt;solaar;solaar +pcscd;apt;cardreader;pcscd +pcsc-tools;apt;cardreader;pcsc-tools +guvcview;apt;webcam;guvcview +cheese;apt;webcam;cheese +tlp;apt;tlp;tlp +notepadqq;apt;dev;notepadqq +gpick;apt;dev;gpick +virtualbox;apt;dev;virtualbox +build-essential;apt;dev;build-essential +ghex;apt;dev;ghex +glade;apt;dev;glade +eric;apt;dev;eric +bluefish;apt;dev;bluefish +meld;apt;dev;meld +zeal;apt;dev;zeal +shellcheck;apt;dev;shellcheck +umbrello;apt;dev;umbrello +ack-grep;apt;dev;ack-grep +ansible;apt;dev;ansible +docker.io;apt;dev;dockerio +remark-lint;npm;dev;remark-lint +beautysh;pip;dev;beautysh +mycli;pip;dev;mycli +sqlitebrowser;apt;dev;sqlitebrowser +jq;apt;dev;jq +tig;apt;dev;tig +postman;snap;dev;postman +javascript-common;apt;javascript;javascript-common +yarn;npm;javascript;yarn +emma-cli;npm;javascript;emma-cli +jshint;npm;javascript;jshint +typescript;npm;javascript;typescript +@angular/cli;npm;javascript;angularcli +ionic;npm;javascript;ionic +cordova;npm;javascript;cordova +eslint;npm;javascript;eslint +web-ext;npm;javascript;web-ext +openjdk-11-jdk;apt;java11;openjdk-11-jdk +php7.4-cli;apt;php;php7.4-cli +php-pear;apt;php;php-pear +composer;apt;php;composer +luajit;apt;lua;luajit +ruby-dev;apt;ruby;ruby-dev +ruby-full;apt;ruby;ruby-full +ruby-rainbow;apt;ruby;ruby-rainbow +anjuta;apt;anjuta;anjuta +anjuta-extras;apt;anjuta;anjuta-extras +codeblocks;apt;codeblocks;codeblocks +codeblocks-contrib;apt;codeblocks;codeblocks-contrib +geany;apt;geany;geany +geany-plugins;apt;geany;geany-plugins +brackets;snap;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 +freecad;apt;cad;freecad +code;apt;code;code +atom;apt;atom;atom +sqlparse;pip;atom;sqlparse +flake8;pip;atom;flake8 +autopep8;pip;atom;autopep8 +htmlbeautifier;gem;atom;htmlbeautifier +nitrogen;apt;nitrogen;nitrogen +libreoffice;apt;office;libreoffice6 +wine-stable;apt;wine;wine-stable +winetricks;apt;wine;winetricks +playonlinux;apt;wine;playonlinux +qt5-doc;apt;qt;qt5-doc +qttools5-doc;apt;qt;qttools5-doc +qttools5-dev-tools;apt;qt;qttools5-dev-tools +qttools5-examples;apt;qt;qttools5-examples +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 +eclipse;snap;eclipse;eclipse +gitkraken;snap;gitkraken;gitkraken +linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04" + +#TODO +#winehq-stable;apt;wine;winehq-stable +#TODO : no focal support yet +#aptik;apt;utilities;aptik +#brackets;apt;brackets;brackets +#vidcutter;apt;multimedia;vidcutter +#green-recorder;apt;multimedia;green-recorder +#mongodb-org;apt;mongodb;mongodb + +#-----------------------------------------------------------------------------# +# Specific Repo list and functions # +#-----------------------------------------------------------------------------# + +# +# list of specific repositories +# fields : unique ID, function to add repo +# +AppsRepo="code;addRepo_VSCode +androidstudio;addRepo_AndroidStudio +sublime-text;addRepo_SublimeText +vivaldi-stable;addRepo_Vivaldi +syncthing;addRepo_Syncthing +opera-stable;addRepo_Opera +insync;addRepo_Insync +google-chrome-stable;addRepo_ChromeStable +atom;addRepo_Atom +nodejslts;addRepo_NodeLts +telegram;addRepo_Telegram +skypeforlinux;addRepo_SkypeForLinux +y-ppa-manager;addRepo_YPPAManager +diodon;addRepo_Diodon +krita;addRepo_Krita +oracle-java10-installer;addRepo_Java10 +oracle-java10-set-default;addRepo_Java10 +plata-theme;addRepo_Plata +rhythmbox-plugin-alternative-toolbar;addRepo_Rhythmbox +rhythmbox-plugin-artdisplay;addRepo_Rhythmbox +rhythmbox-plugin-cdrecorder;addRepo_Rhythmbox +rhythmbox-plugin-close-on-hide;addRepo_Rhythmbox +rhythmbox-plugin-countdown-playlist;addRepo_Rhythmbox +rhythmbox-plugin-desktopart;addRepo_Rhythmbox +rhythmbox-plugin-equalizer;addRepo_Rhythmbox +rhythmbox-plugin-fileorganizer;addRepo_Rhythmbox +rhythmbox-plugin-fullscreen;addRepo_Rhythmbox +rhythmbox-plugin-hide;addRepo_Rhythmbox +rhythmbox-plugin-jumptowindow;addRepo_Rhythmbox +rhythmbox-plugin-llyrics;addRepo_Rhythmbox +rhythmbox-plugin-looper;addRepo_Rhythmbox +rhythmbox-plugin-opencontainingfolder;addRepo_Rhythmbox +rhythmbox-plugin-parametriceq;addRepo_Rhythmbox +rhythmbox-plugin-playlist-import-export;addRepo_Rhythmbox +rhythmbox-plugin-podcast-pos;addRepo_Rhythmbox +rhythmbox-plugin-randomalbumplayer;addRepo_Rhythmbox +rhythmbox-plugin-rating-filters;addRepo_Rhythmbox +rhythmbox-plugin-remembertherhythm;addRepo_Rhythmbox +rhythmbox-plugin-repeat-one-song;addRepo_Rhythmbox +rhythmbox-plugin-rhythmweb;addRepo_Rhythmbox +rhythmbox-plugin-screensaver;addRepo_Rhythmbox +rhythmbox-plugin-smallwindow;addRepo_Rhythmbox +rhythmbox-plugin-spectrum;addRepo_Rhythmbox +rhythmbox-plugin-suspend;addRepo_Rhythmbox +rhythmbox-plugin-wikipedia;addRepo_Rhythmbox +rhythmbox-plugins;addRepo_Rhythmbox +rawtherapee;addRepo_DhorMyWay +entangle;addRepo_DhorMyWay +audacious;addRepo_Webupd8 +qt5ct;addRepo_Webupd8 +screenkey;addRepo_Webupd8 +yad;addRepo_Webupd8 +woeusb;addRepo_Webupd8 +cpu-g;addRepo_Atareao +picard;addRepo_Picard +birdtray;addRepo_Linuxuprising +pdfarranger;addRepo_Linuxuprising +kdenlive;addRepo_KDEnlive +lutris;addRepo_Lutris +balena-etcher-electron;addRepo_Belena +font-manager;addRepo_FontManager +megasync;addRepo_MEGA +deluge-gtk;addRepo_Deluge +cawbird;addRepo_Cawbird +indicator-sound-switcher;addRepo_IndicatorSoundSwitcher +flacon;addRepo_Flacon +gyazo;addRepo_Gyazo +simplescreenrecorder;addRepo_SimpleScreenRecorder +guake;addRepo_LinuxUprising_Guake +selene;addRepo_Teejee2008 +peek;addRepo_Peek +quiterss;addRepo_Quiterss +virtualbox;addRepo_VirtualBox +sqlitebrowser;addRepo_SQLiteBrowser +numix-icon-theme;addRepo_Numix +numix-icon-theme-circle;addRepo_Numix +mkvtoolnix-gui;addRepo_MKVToolnix +transmission-gtk;addRepo_Transmissionbt +handbrake-cli;addRepo_Handbrake +handbrake;addRepo_Handbrake +kodi;addRepo_Kodi" + +#TODO +#winehq-stable;addRepo_WineHQ +#TODO : to check +#avidemux2.7;addRepo_Avidemux +#TODO : no focal support yet / or not needed yet +#youtube-dlg;addRepo_Webupd8 +#brackets;addRepo_Brackets +#vidcutter;addRepo_Vidcutter +#notepadqq;addRepo_Notepadqq +#darktable;addRepo_DarkTable +#numix-gtk-theme;addRepo_Numix +#aptik;addRepo_Teejee2008 +#grub-customizer;addRepo_GrubCustomizer +#syncthinggtk;addRepo_SyncthingGtk +#wireshark;addRepo_WireShark +#green-recorder;addRepo_GreenRecorder +#mongodb;addRepo_MongoDB_CE +#ubuntu-make;addRepo_UbuntuMake +#flatpak;addRepo_flatpak + +# +# Ubuntu Make #TODO : no focal support yet +# +# function addRepo_UbuntuMake () { +# addPPA ppa:ubuntu-desktop/ubuntu-make +# } + +# +# Cawbird #TODO +# +function addRepo_Cawbird () { + addKey "https://download.opensuse.org/repositories/home:IBBoard:cawbird/xUbuntu_20.04/Release.key" + addRepo cawbird.list \ + "deb http://download.opensuse.org/repositories/home:/IBBoard:/cawbird/xUbuntu_20.04/ /" +} + +# +# Font Manager +# +function addRepo_FontManager () { + addPPA ppa:font-manager/staging +} + + +# +# Flatpak #TODO : no focal support yet +# +# function addRepo_flatpak () { +# addPPA ppa:alexlarsson/flatpak +# } + + +# +# Belena Etcher +# +function addRepo_Belena () { + addKey "keyserver.ubuntu.com" \ + "379CE192D401AB61" + addRepo balena-etcher.list \ + "deb https://deb.etcher.io stable etcher" +} + + +# +# Wine HQ #TODO +# +# function addRepo_WineHQ () { +# addPPA ppa:cybermax-dexter/sdl2-backport +# addKey "https://dl.winehq.org/wine-builds/winehq.key" +# addRepo winehq.list \ +# "deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main" +# } + +# +# Lutris +# +function addRepo_Lutris () { + addPPA ppa:lutris-team/lutris +} + +# +# MEGASync +# +function addRepo_MEGA () { + addKey "https://mega.nz/linux/MEGAsync/xUbuntu_20.04/Release.key" + addRepo megasync.list \ + "deb https://mega.nz/linux/MEGAsync/xUbuntu_20.04/ ./" +} + +# +# KDEnlive +# +function addRepo_KDEnlive () { + addPPA ppa:kdenlive/kdenlive-stable +} + +# +# Makoto no blog repo +# +function addRepo_Makoto () { + addKey "https://packagecloud.io/makoto/stable/gpgkey" + addRepo makoto.list \ + "deb https://packagecloud.io/makoto/stable/ubuntu/ focal main" +} + +# +# Plata Theme +# +function addRepo_Plata () { + addPPA ppa:tista/plata-theme +} + +# +# LinuxUpRising repo (Birdtray (for Thunderbird), PDFArranger) +# +function addRepo_Linuxuprising () { + addPPA ppa:linuxuprising/apps +} + +# +# MusicBrainz Picard +# +function addRepo_Picard () { + addPPA ppa:musicbrainz-developers/stable +} + +# +# Atareao ppa +# +function addRepo_Atareao () { + addPPA ppa:atareao/atareao +} + +# +# Syncthing-GTK #TODO : no focal support yet (repo and app) +# +# function addRepo_SyncthingGtk () { +# addKey "https://download.opensuse.org/repositories/home:kozec/xUbuntu_18.04/Release.key" +# addRepo syncthinggtk.list \ +# "deb http://download.opensuse.org/repositories/home:/kozec/xUbuntu_18.04/ /" +# } + +# +# Linux Uprising (Guake) +# +function addRepo_LinuxUprising_Guake () { + addPPA ppa:linuxuprising/guake +} + +# +# Webupd8 (Audacious, ...) +# +function addRepo_Webupd8 () { + addPPA ppa:nilarimogard/webupd8 +} + +# +# MKVToolnix +# +function addRepo_MKVToolnix () { + addKey "https://mkvtoolnix.download/gpg-pub-moritzbunkus.txt" + addRepo mkv.list \ + "deb https://mkvtoolnix.download/ubuntu/ focal main" \ + "deb-src https://mkvtoolnix.download/ubuntu/ focal main" +} + +# +# Entangle, Rawtherapee +# +function addRepo_DhorMyWay () { + addPPA ppa:dhor/myway +} + +# +# Rhythmbox +# +function addRepo_Rhythmbox () { + addPPA ppa:fossfreedom/rhythmbox-plugins +} + +# +# Numix themes/icons +# +function addRepo_Numix () { + addPPA ppa:numix/ppa +} + +# +# Grub-Customizer #TODO : no focal support yet +# +# function addRepo_GrubCustomizer () { +# addPPA ppa:danielrichter2007/grub-customizer +# } + +# +# Simple-Screen-Recorder +# +function addRepo_SimpleScreenRecorder () { + addPPA ppa:maarten-baert/simplescreenrecorder +} + +# +# Green-Recorder #TODO : no focal support yet +# +# function addRepo_GreenRecorder () { +# addPPA ppa:fossproject/ppa +# } + +# +# Oracle JAVA 10 +# +function addRepo_Java10 () { + addPPA ppa:linuxuprising/java +} + +# +# Vidcutter #TODO : no focal support yet +# +# function addRepo_Vidcutter () { +# addPPA ppa:ozmartian/apps +# } + +# +# Krita +# +function addRepo_Krita () { + addPPA ppa:kritalime/ppa +} + +# +# indicator-sound-switcher #TODO +# +function addRepo_IndicatorSoundSwitcher () { + addPPA ppa:yktooo/ppa +} + +# +# Kodi / XBMC +# +function addRepo_Kodi () { + addPPA ppa:team-xbmc/ppa +} + +# +# Deluge #TODO +# +function addRepo_Deluge () { + addPPA ppa:deluge-team/stable +} + +# +# Diodon +# +function addRepo_Diodon () { + addPPA ppa:diodon-team/stable +} + +# +# Y-PPA-Manager +# +function addRepo_YPPAManager () { +addPPA ppa:webupd8team/y-ppa-manager +} + +# +# flacon +# +function addRepo_Flacon () { + addPPA ppa:flacon/ppa +} + +# +# Notepadqq #TODO : no focal support yet +# +# function addRepo_Notepadqq () { +# addPPA ppa:notepadqq-team/notepadqq +# } + +# +# Handbrake +# +function addRepo_Handbrake () { + addPPA ppa:stebbins/handbrake-releases +} + +# +# Transmission-BT +# +function addRepo_Transmissionbt () { + addPPA ppa:transmissionbt/ppa +} + +# +# QuiteRSS +# +function addRepo_Quiterss () { + addPPA ppa:quiterss/quiterss +} + +# +# Avidemux #TODO to keep ? +# +# function addRepo_Avidemux () { +# addPPA ppa:ubuntuhandbook1/avidemux +# } + +# +# conky-manager, selene, timeshift +# +function addRepo_Teejee2008 () { + addPPA ppa:teejee2008/ppa +} + +# +# SQLiteBrowser +# +function addRepo_SQLiteBrowser () { + addPPA ppa:linuxgndu/sqlitebrowser +} + +# +# Peek +# +function addRepo_Peek () { + addPPA ppa:peek-developers/stable +} + +# +# Telegram +# +function addRepo_Telegram () { + addPPA ppa:atareao/telegram +} + +# +# Skype for Linux +# +function addRepo_SkypeForLinux () { + addKey "https://repo.skype.com/data/SKYPE-GPG-KEY" + addRepo "skype-stable.list" \ + "deb [arch=amd64] https://repo.skype.com/deb stable main" +} + +# +# NodeJS LTS +# +function addRepo_NodeLts () { + addKey "https://deb.nodesource.com/gpgkey/nodesource.gpg.key" + addRepo "nodesource.list" \ + "deb https://deb.nodesource.com/node_12.x focal main" \ + "deb-src https://deb.nodesource.com/node_12.x focal main" +} + +# +# Brackets IDE #TODO : no focal support yet and ever ? +# +# function addRepo_Brackets () { +# addPPA ppa:webupd8team/brackets +# } + +# +# Darktable RAW Editor #TODO : no focal support yet +# +# function addRepo_DarkTable () { +# addPPA ppa:pmjdebruijn/darktable-release +# } + +# +# WireShark #TODO : no focal support yet +# +# function addRepo_WireShark () { +# addPPA ppa:wireshark-dev/stable +# } + +# +# Atom IDE +# +function addRepo_Atom () { + addKey "https://packagecloud.io/AtomEditor/atom/gpgkey" + addRepo atom.list \ + "deb [arch=amd64] https://packagecloud.io/AtomEditor/atom/any/ any main" +} + +# +# Google Chrome (stable) +# +function addRepo_ChromeStable () { + addKey "https://dl.google.com/linux/linux_signing_key.pub" + addRepo google-chrome.list \ + "deb [arch=amd64] http://dl.google.com/linux/chrome/deb/ stable main" +} + +# +# Insync +# +function addRepo_Insync () { + addKey "keyserver.ubuntu.com" \ + "ACCAF35C" + addRepo insync.list \ + "deb http://apt.insync.io/ubuntu focal non-free contrib" +} + +# +# Opera (stable) +# +function addRepo_Opera () { + addKey "http://deb.opera.com/archive.key" + addRepo opera.list \ + "deb http://deb.opera.com/opera-stable/ stable non-free" +} + +# +# Syncthing +# +function addRepo_Syncthing () { + addKey "https://syncthing.net/release-key.txt" + addRepo syncthing.list \ + "deb http://apt.syncthing.net/ syncthing release" +} + +# +# VirtualBox +# +function addRepo_VirtualBox () { + addKey "http://download.virtualbox.org/virtualbox/debian/oracle_vbox.asc" + addKey "http://download.virtualbox.org/virtualbox/debian/oracle_vbox_2016.asc" + addRepo virtualbox.list \ + "deb [arch=amd64] http://download.virtualbox.org/virtualbox/debian focal contrib" +} + +# +# Vivaldi +# +function addRepo_Vivaldi () { + addKey "http://repo.vivaldi.com/stable/linux_signing_key.pub" + addRepo vivaldi.list \ + "deb http://repo.vivaldi.com/stable/deb/ stable main " +} + +# +# SublimeText +# +function addRepo_SublimeText () { + addKey "https://download.sublimetext.com/sublimehq-pub.gpg" + addRepo sublime-text.list \ + "deb https://download.sublimetext.com/ apt/dev/" +} + +# +# Gyazo +# +function addRepo_Gyazo () { + addKey "https://packagecloud.io/gyazo/gyazo-for-linux/gpgkey" + addRepo "gyazo_gyazo-for-linux.list" \ + "deb https://packagecloud.io/gyazo/gyazo-for-linux/ubuntu/ focal main" \ + "deb-src https://packagecloud.io/gyazo/gyazo-for-linux/ubuntu/ focal main" +} + +# +# MongoDB 4 CE #TODO : no focal support yet +# +# function addRepo_MongoDB_CE () { +# addKey "https://www.mongodb.org/static/pgp/server-4.2.asc" +# addRepo "mongodb-org-4.2.list" \ +# "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" +# } + +# +# Visual Studio Code +# +function addRepo_VSCode () { + addKey "https://packages.microsoft.com/keys/microsoft.asc" + addRepo "vscode.list" \ + "deb [arch=amd64] https://packages.microsoft.com/repos/vscode stable main" +} + +# +# Android-Studio +# +function addRepo_AndroidStudio () { + addPPA ppa:maarten-fonville/android-studio +} + +#-----------------------------------------------------------------------------# +# Package pre install functions list # +#-----------------------------------------------------------------------------# + +# +# list of pre install functions +# fields : unique ID, function to process before install +# +AppsPreTrtFct="opera-stable;opera_PreTrtFct +steam;steam_PreTrtFct +wireshark;wireshark_PreTrtFct" + +# +# Opera +# +function opera_PreTrtFct () { + runCmd "echo opera-stable opera-stable/add-deb-source boolean false | sudo debconf-set-selections" \ + "setting as do not add repo" +} + +# +# Steam +# +function steam_PreTrtFct () { + runCmd "echo \"steam steam/purge note\" | sudo debconf-set-selections" \ + "accepting steam licence" + runCmd "echo \"steam steam/license note\" | sudo debconf-set-selections" \ + "accepting steam licence 2/3" + runCmd "echo \"steam steam/question select I AGREE\" | sudo debconf-set-selections" \ + "accepting steam licence 3/3" +} + +# +# Wireshark +# +function wireshark_PreTrtFct () { + runCmd "echo wireshark-common wireshark-common/install-setuid boolean true | sudo debconf-set-selections" \ + "setting Wireshark as root only" +} + +#-----------------------------------------------------------------------------# +# Package post install functions list # +#-----------------------------------------------------------------------------# + +# +# list of post install functions +# fields : unique ID, function to process after install +# +AppsPostTrtFct="nitrogen;nitrogen_PostTrtFct +mongodb;mongodb_PostTrtFct +qttools5-dev-tools;qt_PostTrtFct +plank;plank_PostTrtFct +androidstudio;android_PostTrtFct +nodejslts;nodejslts_PostTrtFct +angularcli;angularcli_PostTrtFct +dockerio;dockerio_PostTrtFct +megasync;megasync_PostTrtFct +flatpak;flatpak_PostTrtFct +ruby-dev;ruby-dev_PostTrtFct +virtualbox;virtualbox_PostTrtFct" + +# +# virtualbox +# +function virtualbox_PostTrtFct () { + cUser=$(whoami) + runCmd "sudo adduser $cUser vboxusers" \ + "adding user to vboxusers group" +} + +# +# NPM Update +# +function nodejslts_PostTrtFct () { + printf "[NPM] set prefix in ~/.local " + printf "\n[NPM] set prefix in ~/.local\n" &>> $logFile + npm config set prefix /home/$myHomedir/.local &>> $logFile + ret_code=$? + retCode $ret_code + + if [ `grep 'PATH=~/.local/bin/:$PATH' ~/.bashrc | wc -l` -gt 0 ]; then + printf "[NPM] add ~/.local/bin to PATH ... already added [ "$BOLDVERT"OK"$NORMAL" ]\n " + else + printf "[NPM] add ~/.local/bin to PATH " + printf "\n[NPM] add ~/.local/bin to PATH\n" &>> $logFile + echo 'PATH=~/.local/bin/:$PATH' | tee -a ~/.bashrc &>> $logFile + ret_code=$? + retCode $ret_code + fi + + printf "[NPM] update npm " + printf "\n[NPM] update npm\n" &>> $logFile + npm i -g npm &>> $logFile + ret_code=$? + retCode $ret_code +} + + +# +# GEM / Ruby Dev +# +function ruby-dev_PostTrtFct () { + printf "[GEM] update --system " + printf "\n[GEM] update --system\n" &>> $logFile + sudo gem update --system &>> $logFile + ret_code=$? + retCode $ret_code +} + +# +# Flatpak +# +function flatpak_PostTrtFct () { + if which flatpak >/dev/null; then + printf "[FLATPAK] Adding Flathub repository " + printf "\n[FLATPAK] Adding Flathub repository\n" &>> $logFile + sudo flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo &>> $logFile + ret_code=$? + retCode $ret_code + fi +} + + +# +# MEGASync +# +function megasync_PostTrtFct () { + if which thunar >/dev/null; then + installPackage apt thunar-megasync + fi + if which nautilus >/dev/null; then + installPackage apt nautilus-megasync + fi +} + +# +# Docker +# +function dockerio_PostTrtFct () { + runCmd "sudo systemctl start docker" \ + "start docker service" + runCmd "sudo systemctl enable docker" \ + "add docker service at boot" + runCmd "sudo groupadd --quiet docker" \ + "add docker group" + cUser=$(whoami) + runCmd "sudo usermod -aG docker $cUser" \ + "add current user to docker group" +} + +# +# Angular CLI +# +function angularcli_PostTrtFct () { + if which yarn >/dev/null; then + runCmd "ng config -g cli.packageManager yarn" \ + "using yarn instead of nom for angular/cli" + fi +} + +# +# Android Env for adb, fastboot, .... +# +function android_PostTrtFct () { + printf "[CMD] Adding Android devices UDEV rules " + +cat << EOF | sudo tee /etc/udev/rules.d/99-android.rules +SUBSYSTEM=="usb", ATTR{idVendor}=="0502", MODE="0666", OWNER="$myHomedir" # Acer +SUBSYSTEM=="usb", ATTR{idVendor}=="0b05", MODE="0666", OWNER="$myHomedir" # Asus +SUBSYSTEM=="usb", ATTR{idVendor}=="413c", MODE="0666", OWNER="$myHomedir" # Dell +SUBSYSTEM=="usb", ATTR{idVendor}=="0489", MODE="0666", OWNER="$myHomedir" # Foxconn +SUBSYSTEM=="usb", ATTR{idVendor}=="04c5", MODE="0666", OWNER="$myHomedir" # Fujitsu +SUBSYSTEM=="usb", ATTR{idVendor}=="04c5", MODE="0666", OWNER="$myHomedir" # Fujitsu-Toshiba +SUBSYSTEM=="usb", ATTR{idVendor}=="091e", MODE="0666", OWNER="$myHomedir" # Garmin-Asus +SUBSYSTEM=="usb", ATTR{idVendor}=="18d1", MODE="0666", OWNER="$myHomedir" # Google-Nexus +SUBSYSTEM=="usb", ATTR{idVendor}=="201E", MODE="0666", OWNER="$myHomedir" # Haier +SUBSYSTEM=="usb", ATTR{idVendor}=="109b", MODE="0666", OWNER="$myHomedir" # Hisense +SUBSYSTEM=="usb", ATTR{idVendor}=="0bb4", MODE="0666", OWNER="$myHomedir" # HTC +SUBSYSTEM=="usb", ATTR{idVendor}=="12d1", MODE="0666", OWNER="$myHomedir" # Huawei +SUBSYSTEM=="usb", ATTR{idVendor}=="8087", MODE="0666", OWNER="$myHomedir" # Intel +SUBSYSTEM=="usb", ATTR{idVendor}=="24e3", MODE="0666", OWNER="$myHomedir" # K-Touch +SUBSYSTEM=="usb", ATTR{idVendor}=="2116", MODE="0666", OWNER="$myHomedir" # KT Tech +SUBSYSTEM=="usb", ATTR{idVendor}=="0482", MODE="0666", OWNER="$myHomedir" # Kyocera +SUBSYSTEM=="usb", ATTR{idVendor}=="17ef", MODE="0666", OWNER="$myHomedir" # Lenovo +SUBSYSTEM=="usb", ATTR{idVendor}=="1004", MODE="0666", OWNER="$myHomedir" # LG +SUBSYSTEM=="usb", ATTR{idVendor}=="22b8", MODE="0666", OWNER="$myHomedir" # Motorola +SUBSYSTEM=="usb", ATTR{idVendor}=="0e8d", MODE="0666", OWNER="$myHomedir" # MTK +SUBSYSTEM=="usb", ATTR{idVendor}=="0409", MODE="0666", OWNER="$myHomedir" # NEC +SUBSYSTEM=="usb", ATTR{idVendor}=="2080", MODE="0666", OWNER="$myHomedir" # Nook +SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0666", OWNER="$myHomedir" # Nvidia +SUBSYSTEM=="usb", ATTR{idVendor}=="2257", MODE="0666", OWNER="$myHomedir" # OTGV +SUBSYSTEM=="usb", ATTR{idVendor}=="10a9", MODE="0666", OWNER="$myHomedir" # Pantech +SUBSYSTEM=="usb", ATTR{idVendor}=="1d4d", MODE="0666", OWNER="$myHomedir" # Pegatron +SUBSYSTEM=="usb", ATTR{idVendor}=="0471", MODE="0666", OWNER="$myHomedir" # Philips +SUBSYSTEM=="usb", ATTR{idVendor}=="04da", MODE="0666", OWNER="$myHomedir" # PMC-Sierra +SUBSYSTEM=="usb", ATTR{idVendor}=="05c6", MODE="0666", OWNER="$myHomedir" # Qualcomm +SUBSYSTEM=="usb", ATTR{idVendor}=="1f53", MODE="0666", OWNER="$myHomedir" # SK Telesys +SUBSYSTEM=="usb", ATTR{idVendor}=="04e8", MODE="0666", OWNER="$myHomedir" # Samsung +SUBSYSTEM=="usb", ATTR{idVendor}=="04dd", MODE="0666", OWNER="$myHomedir" # Sharp +SUBSYSTEM=="usb", ATTR{idVendor}=="054c", MODE="0666", OWNER="$myHomedir" # Sony +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", OWNER="$myHomedir" # Sony Ericsson +SUBSYSTEM=="usb", ATTR{idVendor}=="0fce", MODE="0666", OWNER="$myHomedir" # Sony Mobile Communications +SUBSYSTEM=="usb", ATTR{idVendor}=="2340", MODE="0666", OWNER="$myHomedir" # Teleepoch +SUBSYSTEM=="usb", ATTR{idVendor}=="0930", MODE="0666", OWNER="$myHomedir" # Toshiba +SUBSYSTEM=="usb", ATTR{idVendor}=="19d2", MODE="0666", OWNER="$myHomedir" # ZTE +EOF + + ret_code=$? + retCode $ret_code + + runCmd "sudo service udev restart" \ + "restarting UDEV service" +} + +# +# Plank themes +# +function plank_PostTrtFct () { + typeset ret_code + + if ! (( $(ps -ef | grep -v grep | grep plank | wc -l) > 0 )); then + plank 2&>1 >/dev/null & + sleep 10 + fi + + yes | sh -c "cd ~ \ + && mkdir -p ~/.temp-plank-themer \ + && cd ~/.temp-plank-themer \ + && wget https://github.com/rhoconlinux/plank-themer/archive/master.zip \ + && unzip master.zip \ + && cd plank-themer-master/ \ + && rm -fR ~/.config/plank/dock1/theme_index; \ + rm -fR ~/.config/plank/dock1/themes-repo; \ + mkdir -p ~/.config/plank/dock1; \ + cp -a theme_index/ ~/.config/plank/dock1 \ + && cp -a themes-repo/ ~/.config/plank/dock1 \ + && cd ~ \ + && rm -R ~/.temp-plank-themer \ + && sh ~/.config/plank/dock1/theme_index/plank-on-dock-themer.sh" &>> $logFile + ret_code=$? + retCode $ret_code +} + +# +# QT5 Dev Tools +# +function qt_PostTrtFct () { + runCmd "sudo ln -s /usr/share/qtchooser/qt5-x86_64-linux-gnu.conf /usr/lib/x86_64-linux-gnu/qtchooser/default.conf" \ + "set QT5 as default" +} + +# +# MongoDB CE +# +function mongodb_PostTrtFct () { + runCmd "sudo systemctl enable mongod.service" \ + "enabling mongod service at boot" + runCmd "sudo systemctl start mongod.service" \ + "starting mongod service" +} + +# +# nitrogen post install function +# +function nitrogen_PostTrtFct () { + if isMate; then + runCmd "gsettings set org.mate.background draw-background false" \ + "disabling Caja background management" + runCmd "gsettings set org.mate.background show-desktop-icons false" \ + "disabling Caja desktop icons management" + + createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ + "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ + "Utility;GTK" \ + "Nitrogen" \ + "local" \ + "start" + update-menus + elif isCinnamon; then + runCmd "gsettings set org.nemo.desktop draw-background false" \ + "disabling Caja background management" + runCmd "gsettings set org.nemo.desktop show-desktop-icons false" \ + "disabling Caja desktop icons management" + + createAppShortcut "bash -c \"sleep 10; nitrogen --restore\"" \ + "/usr/share/icons/hicolor/48x48/apps/nitrogen.png" \ + "Utility;GTK" \ + "Nitrogen" \ + "local" \ + "start" + update-menus + else + printf "[ERR] only Mate/Cinnamon Desktop is currently supported\n" + fi +} diff --git a/vars.sh b/vars.sh index e1ec9b6..2f8d4aa 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.5.2-b3" +version="0.6.0-b1" # # myHomedir is used in full paths to the homedir From 30fb76e54d05e83164438c2c3a33b2ab5e5ab403 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 22 May 2020 23:40:03 +0200 Subject: [PATCH 206/261] snap-store added to 20.04 branch --- repo_functions_ub2004.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 0c247b6..81bf135 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -180,6 +180,7 @@ translatium;snap;utilities;translatium font-manager;apt;utilities;font-manager gyazo;apt;utilities;gyazo woeusb;apt;utilities;woeusb +snap-store;snap;utilities;snap-store python3-dev;apt;python;python3-dev python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools From 46898d7ec8ff7abc1520ec66cb28781723e0a192 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 May 2020 00:24:11 +0200 Subject: [PATCH 207/261] inxi added to 20.04 branch --- repo_functions_ub2004.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 81bf135..4496a35 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -181,6 +181,7 @@ font-manager;apt;utilities;font-manager gyazo;apt;utilities;gyazo woeusb;apt;utilities;woeusb snap-store;snap;utilities;snap-store +inxi;apt;utilities;inxi python3-dev;apt;python;python3-dev python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools From ed7ed50f386c184a16f9bdd3d7ae36c21d36cf86 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 May 2020 00:26:45 +0200 Subject: [PATCH 208/261] 2 old tool removed --- menus_functions_ub1804.sh | 8 -------- menus_functions_ub2004.sh | 8 -------- tools_functions.sh | 29 ----------------------------- 3 files changed, 45 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 0666a7b..f7c9de9 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -122,9 +122,7 @@ function showSysToolsMenu () { "inxi" "System informations" \ "speedtest-cli" "Bandwidth test" \ "packetloss" "Packetloss test (ping)" \ - "OptimizeFirefox" "Firefox SQLite databases optimization" \ "Autoremove" "Remove useless Deb packages" \ - "CleanOldKernels" "Removing old kernels (keep 2 last kernels)" \ "SoundCardsDetection" "Sound Cards Detection" \ "Back" "Back" 3>&1 1>&2 2>&3) @@ -138,15 +136,9 @@ function showSysToolsMenu () { "packetloss") clear; toolPacketLoss; pressKey ;; - "OptimizeFirefox") - clear; toolOptimizeFirefox; pressKey - ;; "Autoremove") clear; toolAutoremove; pressKey ;; - "CleanOldKernels") - clear; toolClearOldKernels; pressKey - ;; "SoundCardsDetection") clear; toolSoundCardsDetection; pressKey ;; diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index de3ade1..62dbc2e 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -122,9 +122,7 @@ function showSysToolsMenu () { "inxi" "System informations" \ "speedtest-cli" "Bandwidth test" \ "packetloss" "Packetloss test (ping)" \ - "OptimizeFirefox" "Firefox SQLite databases optimization" \ "Autoremove" "Remove useless Deb packages" \ - "CleanOldKernels" "Removing old kernels (keep 2 last kernels)" \ "SoundCardsDetection" "Sound Cards Detection" \ "Back" "Back" 3>&1 1>&2 2>&3) @@ -138,15 +136,9 @@ function showSysToolsMenu () { "packetloss") clear; toolPacketLoss; pressKey ;; - "OptimizeFirefox") - clear; toolOptimizeFirefox; pressKey - ;; "Autoremove") clear; toolAutoremove; pressKey ;; - "CleanOldKernels") - clear; toolClearOldKernels; pressKey - ;; "SoundCardsDetection") clear; toolSoundCardsDetection; pressKey ;; diff --git a/tools_functions.sh b/tools_functions.sh index 1956bb5..20a46e6 100644 --- a/tools_functions.sh +++ b/tools_functions.sh @@ -101,26 +101,6 @@ function toolPacketLoss () { ping -q -c 10 google.com } -# -# Optimization of SQLite databases of Firefox and Firefox Nightly -# -function toolOptimizeFirefox () { - if (whiptail --title "Firefox SQLite DB Optimization" --yesno "Terminate Firefox and proceed ?" 10 60) then - if which firefox >/dev/null; then - printf "Optimizing Firefox" - pkill -9 firefox - for f in ~/.mozilla/firefox/*/*.sqlite; do sqlite3 $f 'VACUUM; REINDEX;'; done - printf "\n" - fi - if which firefox-trunk >/dev/null; then - printf "Optimizing Firefox Nightly" - pkill -9 firefox-trunk - for f in ~/.mozilla/firefox-trunk/*/*.sqlite; do sqlite3 $f 'VACUUM; REINDEX;'; done - printf "\n" - fi - fi -} - # # remove useless packages (depedencies) # @@ -129,15 +109,6 @@ function toolAutoremove () { "removing not necessary dependencies" } -# -# remove old versions of installed kernels -# -function toolClearOldKernels () { - checkAndInstallDep apt ukuu ukuu \ - && runCmd "sudo ukuu --purge-old-kernels --yes" \ - "removing old kernels" -} - # # force soundcards detection # From 9e432ce0e04895e86e1a9e081c60981cdebf0112 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 May 2020 00:40:57 +0200 Subject: [PATCH 209/261] some adujstements about available/or not package for 20.04 branch --- repo_functions_ub2004.sh | 40 +++++++++++++++++----------------------- 1 file changed, 17 insertions(+), 23 deletions(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 4496a35..7415291 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -77,7 +77,6 @@ smplayer-l10n;apt;multimedia;smplayer-l10n handbrake-cli;apt;multimedia;handbrake-cli handbrake;apt;multimedia;handbrake avidemux2.7-qt5;apt;multimedia;avidemux2.7-qt5 -avidemux2.7-plugins-settings;apt;multimedia;avidemux2.7-plugins-settings mjpegtools;apt;multimedia;mjpegtools twolame;apt;multimedia;twolame lame;apt;multimedia;lame @@ -104,7 +103,6 @@ kdenlive;apt;multimedia;kdenlive com.github.huluti.ImCompressor;flatpak;multimedia;ImCompressor flacon;apt;multimedia;flacon simplescreenrecorder;apt;multimedia;simplescreenrecorder -selene;apt;multimedia;selene vidcutter;snap;multimedia;vidcutter syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk @@ -179,7 +177,6 @@ nvme-cli;apt;utilities;nvme-cli translatium;snap;utilities;translatium font-manager;apt;utilities;font-manager gyazo;apt;utilities;gyazo -woeusb;apt;utilities;woeusb snap-store;snap;utilities;snap-store inxi;apt;utilities;inxi python3-dev;apt;python;python3-dev @@ -361,7 +358,7 @@ autopep8;pip;atom;autopep8 htmlbeautifier;gem;atom;htmlbeautifier nitrogen;apt;nitrogen;nitrogen libreoffice;apt;office;libreoffice6 -wine-stable;apt;wine;wine-stable +winehq-stable;apt;wine;winehq-stable winetricks;apt;wine;winetricks playonlinux;apt;wine;playonlinux qt5-doc;apt;qt;qt5-doc @@ -378,7 +375,7 @@ gitkraken;snap;gitkraken;gitkraken linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04" #TODO -#winehq-stable;apt;wine;winehq-stable +#OLD : wine-stable;apt;wine;wine-stable #TODO : no focal support yet #aptik;apt;utilities;aptik #brackets;apt;brackets;brackets @@ -446,7 +443,6 @@ audacious;addRepo_Webupd8 qt5ct;addRepo_Webupd8 screenkey;addRepo_Webupd8 yad;addRepo_Webupd8 -woeusb;addRepo_Webupd8 cpu-g;addRepo_Atareao picard;addRepo_Picard birdtray;addRepo_Linuxuprising @@ -463,7 +459,6 @@ flacon;addRepo_Flacon gyazo;addRepo_Gyazo simplescreenrecorder;addRepo_SimpleScreenRecorder guake;addRepo_LinuxUprising_Guake -selene;addRepo_Teejee2008 peek;addRepo_Peek quiterss;addRepo_Quiterss virtualbox;addRepo_VirtualBox @@ -474,13 +469,13 @@ mkvtoolnix-gui;addRepo_MKVToolnix transmission-gtk;addRepo_Transmissionbt handbrake-cli;addRepo_Handbrake handbrake;addRepo_Handbrake -kodi;addRepo_Kodi" +kodi;addRepo_Kodi +avidemux2.7;addRepo_Avidemux +winehq-stable;addRepo_WineHQ" -#TODO -#winehq-stable;addRepo_WineHQ -#TODO : to check -#avidemux2.7;addRepo_Avidemux #TODO : no focal support yet / or not needed yet +#woeusb;addRepo_Webupd8 +#selene;addRepo_Teejee2008 #youtube-dlg;addRepo_Webupd8 #brackets;addRepo_Brackets #vidcutter;addRepo_Vidcutter @@ -540,14 +535,13 @@ function addRepo_Belena () { # -# Wine HQ #TODO +# Wine HQ # -# function addRepo_WineHQ () { -# addPPA ppa:cybermax-dexter/sdl2-backport -# addKey "https://dl.winehq.org/wine-builds/winehq.key" -# addRepo winehq.list \ -# "deb https://dl.winehq.org/wine-builds/ubuntu/ bionic main" -# } +function addRepo_WineHQ () { + addKey "https://dl.winehq.org/wine-builds/winehq.key" + addRepo winehq.list \ + "deb https://dl.winehq.org/wine-builds/ubuntu/ focal main" +} # # Lutris @@ -776,11 +770,11 @@ function addRepo_Quiterss () { } # -# Avidemux #TODO to keep ? +# Avidemux # -# function addRepo_Avidemux () { -# addPPA ppa:ubuntuhandbook1/avidemux -# } +function addRepo_Avidemux () { + addPPA ppa:ubuntuhandbook1/avidemux +} # # conky-manager, selene, timeshift From fa7c843d9e2a7a17748915c3b07c6cf53c4810b9 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 May 2020 00:43:51 +0200 Subject: [PATCH 210/261] fix adding docker group in psttrt fct --- repo_functions_ub2004.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 7415291..e621759 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -1096,7 +1096,7 @@ function dockerio_PostTrtFct () { "start docker service" runCmd "sudo systemctl enable docker" \ "add docker service at boot" - runCmd "sudo groupadd --quiet docker" \ + runCmd "sudo groupadd --force docker" \ "add docker group" cUser=$(whoami) runCmd "sudo usermod -aG docker $cUser" \ From 8d40f8a192ec1f87ed434b4795f7565a59185b11 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 May 2020 00:48:03 +0200 Subject: [PATCH 211/261] fix typo --- repo_functions_ub1804.sh | 2 +- repo_functions_ub2004.sh | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index e62b2dd..352c11a 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1247,7 +1247,7 @@ function dockerio_PostTrtFct () { function angularcli_PostTrtFct () { if which yarn >/dev/null; then runCmd "ng config -g cli.packageManager yarn" \ - "using yarn instead of nom for angular/cli" + "using yarn instead of npm for angular/cli" fi } diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index e621759..798394a 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -1109,7 +1109,7 @@ function dockerio_PostTrtFct () { function angularcli_PostTrtFct () { if which yarn >/dev/null; then runCmd "ng config -g cli.packageManager yarn" \ - "using yarn instead of nom for angular/cli" + "using yarn instead of npm for angular/cli" fi } From 1ecd9714cbd89d7a66cc306e4c1d12de5295ab59 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 May 2020 01:06:09 +0200 Subject: [PATCH 212/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 2f8d4aa..c86bd49 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.0-b1" +version="0.6.0-b2" # # myHomedir is used in full paths to the homedir From bd79903672b51efdc02d381db34a93539fb093ce Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 May 2020 01:15:44 +0200 Subject: [PATCH 213/261] focal installation instruction added --- README.md | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/README.md b/README.md index 616b60a..3612bd2 100644 --- a/README.md +++ b/README.md @@ -5,17 +5,16 @@ About The purpose of this script is to provide a tool to install, customize and tweak a fresh installation of Linux Mint / Ubuntu. -The Linux Mint 18 / Ubuntu 16.04 branch is now removed since the 0.5.1 version of Yggdrasil. -No bugs fixed, features or any changes will be made on this branch anymore. -If you still need it, please use an older version from the repository at your own risk ;) - Installation ------------ Linux Mint 20 / Ubuntu 20.04 (Yggdrasil >= 0.5.1) ```shell -# coming soon +curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - +echo "deb https://packagecloud.io/makoto/stable/ubuntu/ focal main" | sudo tee /etc/apt/sources.list.d/makoto.list +sudo apt-get update +sudo apt-get install yggdrasil ``` Linux Mint 19 / Ubuntu 18.04 (Yggdrasil >= 0.5.1) @@ -29,11 +28,16 @@ sudo apt-get install yggdrasil Linux Mint 18 / Ubuntu 16.04 (Yggdrasil < 0.5.1) +>* This version is rather old and using deprecated version of Linux Mint / Ubuntu. +>* No bugs fixed, features or any changes will be made on this branch anymore. +>* If you still need it, use it at your own risk and without guarantee third parties repositories are still available +>* The latest version of Yggdrasil for this branch is : 0.5.0-b23 + ```shell curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - echo "deb https://packagecloud.io/makoto/stable/ubuntu/ xenial main" | sudo tee /etc/apt/sources.list.d/makoto.list sudo apt-get update -sudo apt-get install yggdrasil +sudo apt-get install yggdrasil=0.5.0-b23 ``` Credits From fdc1f2b72096c64a18fa7b7d308b44e7939c5fc8 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 May 2020 18:07:27 +0200 Subject: [PATCH 214/261] handle new option of add-apt-repository to avoid useless update (20.04) --- core_functions.sh | 26 +++++++++++++++++++++----- vars.sh | 2 +- 2 files changed, 22 insertions(+), 6 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 1246a66..4592591 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -79,11 +79,11 @@ function pressKey () { } # -# check if OS is Mint 18 +# check if OS is Mint 18 / Ubuntu 16.04 # function isMint18 () { OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` - if [[ $OS == *"Linux Mint 18"* ]]; then + if [[ $OS == *"Linux Mint 18"* || $OS == *"Ubuntu 16.04"* ]]; then return 0 else return 1 @@ -91,11 +91,23 @@ function isMint18 () { } # -# check if OS is Mint 19 +# check if OS is Mint 19 / Ubuntu 18.04 # function isMint19 () { OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` - if [[ $OS == *"Linux Mint 19"* ]]; then + if [[ $OS == *"Linux Mint 19"* || $OS == *"Ubuntu 18.04"* ]]; then + return 0 + else + return 1 + fi +} + +# +# check if OS is Mint 20 / Ubuntu 20.04 +# +function isMint20 () { + OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` + if [[ $OS == *"Linux Mint 20"* || $OS == *"Ubuntu 20.04"* ]]; then return 0 else return 1 @@ -207,7 +219,11 @@ function addPPA () { if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -q ${str2search}; then printf "[PPA] adding : $* " printf "\n[PPA] adding $*\n" &>> $logFile - sudo add-apt-repository -y $* &>> $logFile + if isMint20; then + sudo add-apt-repository -yn $* &>> $logFile + else + sudo add-apt-repository -y $* &>> $logFile + fi ret_code=$? retCode $ret_code else diff --git a/vars.sh b/vars.sh index c86bd49..ccc3d96 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.0-b2" +version="0.6.0-b3" # # myHomedir is used in full paths to the homedir From 918551fb5bd54be129504c016a17b072383555fe Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 23 May 2020 18:28:16 +0200 Subject: [PATCH 215/261] avidemux repo fct name fixed --- repo_functions_ub2004.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 798394a..03e9b9d 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -76,7 +76,7 @@ smplayer-themes;apt;multimedia;smplayer-themes smplayer-l10n;apt;multimedia;smplayer-l10n handbrake-cli;apt;multimedia;handbrake-cli handbrake;apt;multimedia;handbrake -avidemux2.7-qt5;apt;multimedia;avidemux2.7-qt5 +avidemux2.7-qt5;apt;multimedia;avidemux mjpegtools;apt;multimedia;mjpegtools twolame;apt;multimedia;twolame lame;apt;multimedia;lame @@ -470,7 +470,7 @@ transmission-gtk;addRepo_Transmissionbt handbrake-cli;addRepo_Handbrake handbrake;addRepo_Handbrake kodi;addRepo_Kodi -avidemux2.7;addRepo_Avidemux +avidemux;addRepo_Avidemux winehq-stable;addRepo_WineHQ" #TODO : no focal support yet / or not needed yet From 45b7b3076e8d4910210424c6e8b43f5d738a9860 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 24 May 2020 20:16:08 +0200 Subject: [PATCH 216/261] audacity repo added + moving remove useless flatpak in toolAutoremove (-p option) --- core_functions.sh | 6 ------ repo_functions_ub1804.sh | 10 +++++++++- repo_functions_ub2004.sh | 10 +++++++++- tools_functions.sh | 4 +++- yggdrasil.sh | 1 + 5 files changed, 22 insertions(+), 9 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 4592591..5399785 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -194,12 +194,6 @@ function updateSystem () { sudo flatpak update -y &>> $logFile ret_code=$? retCode $ret_code - - printf "[FLATPAK] uninstall --unused " - printf "\n[FLATPAK] uninstall --unused\n" &>> $logFile - sudo flatpak uninstall --unused -y &>> $logFile - ret_code=$? - retCode $ret_code fi repoAdded=0 diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 352c11a..915137f 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -525,7 +525,15 @@ flatpak;addRepo_flatpak balena-etcher-electron;addRepo_Belena font-manager;addRepo_FontManager cawbird;addRepo_Cawbird -ubuntu-make;addRepo_UbuntuMake" +ubuntu-make;addRepo_UbuntuMake +audacity;addRepo_Audacity" + +# +# Audacity +# +function addRepo_Audacity () { + addPPA ppa:ubuntuhandbook1/audacity +} # # Ubuntu Make diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 03e9b9d..7420b93 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -471,7 +471,8 @@ handbrake-cli;addRepo_Handbrake handbrake;addRepo_Handbrake kodi;addRepo_Kodi avidemux;addRepo_Avidemux -winehq-stable;addRepo_WineHQ" +winehq-stable;addRepo_WineHQ +audacity;addRepo_Audacity" #TODO : no focal support yet / or not needed yet #woeusb;addRepo_Webupd8 @@ -491,6 +492,13 @@ winehq-stable;addRepo_WineHQ" #ubuntu-make;addRepo_UbuntuMake #flatpak;addRepo_flatpak +# +# Audacity +# +function addRepo_Audacity () { + addPPA ppa:ubuntuhandbook1/audacity +} + # # Ubuntu Make #TODO : no focal support yet # diff --git a/tools_functions.sh b/tools_functions.sh index 20a46e6..52afd4c 100644 --- a/tools_functions.sh +++ b/tools_functions.sh @@ -106,7 +106,9 @@ function toolPacketLoss () { # function toolAutoremove () { runCmd "sudo apt-get -y autoremove" \ - "removing not necessary dependencies" + "removing useless APT dependencies" + runCmd "sudo flatpak uninstall --unused -y" \ + "removing useless FLATPAK dependencies" } # diff --git a/yggdrasil.sh b/yggdrasil.sh index 1ace2cb..a097f53 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -248,6 +248,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do exit ;; p) + msg "Removing useless dependencies" toolAutoremove exit ;; From 6877a6a60667ed9168311ad48d8af0d29fe07755 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 24 May 2020 20:16:47 +0200 Subject: [PATCH 217/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index ccc3d96..2caae96 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.0-b3" +version="0.6.0-b4" # # myHomedir is used in full paths to the homedir From 2bc3e85212e3a36b74f86dfe90d9b206ec2c3efd Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 30 May 2020 20:37:14 +0200 Subject: [PATCH 218/261] small changes in python pkg added by default --- repo_functions_ub1804.sh | 4 ---- repo_functions_ub2004.sh | 4 ---- 2 files changed, 8 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 915137f..1c50580 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -199,10 +199,6 @@ font-manager;apt;utilities;font-manager python3-dev;apt;python;python3-dev python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools -PyOpenGL;pip;python;PyOpenGL -tweepy;pip;python;tweepy -weppy;pip;python;weppy -py-term;pip;python;py-term idle3;apt;python;idle3 python-gi;apt;python;python-gi python-gi-cairo;apt;python;python-gi-cairo diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 7420b93..a9e0b93 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -182,10 +182,6 @@ inxi;apt;utilities;inxi python3-dev;apt;python;python3-dev python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools -PyOpenGL;pip;python;PyOpenGL -tweepy;pip;python;tweepy -weppy;pip;python;weppy -py-term;pip;python;py-term idle3;apt;python;idle3 python-gi;apt;python;python-gi python-gi-cairo;apt;python;python-gi-cairo From 366ff1255d70d627706e67a58eafa97e0a31a1c6 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 30 May 2020 20:37:42 +0200 Subject: [PATCH 219/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 2caae96..acb85c2 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.0-b4" +version="0.6.0-b5" # # myHomedir is used in full paths to the homedir From 81da847d02b9ff4561833d015917b88b3146eec5 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 12 Jun 2020 16:55:02 +0200 Subject: [PATCH 220/261] remove snapd install restriction for Mint20 --- repo_functions_ub2004.sh | 13 ++++++++++++- vars.sh | 2 +- 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index a9e0b93..52c12f5 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -967,7 +967,18 @@ function addRepo_AndroidStudio () { # AppsPreTrtFct="opera-stable;opera_PreTrtFct steam;steam_PreTrtFct -wireshark;wireshark_PreTrtFct" +wireshark;wireshark_PreTrtFct +snapd;snapd_PreTrtFct" + +# +# Snap +# +function snapd_PreTrtFct () { + if isMint20; then + runCmd "sudo rm /etc/apt/preferences.d/nosnap.pref" \ + "remove snapd installation restriction [ I'm allergic to it, but need it for some pieces of software... Devs, please provide deb package ;) ]" + fi +} # # Opera diff --git a/vars.sh b/vars.sh index acb85c2..b42d64f 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.0-b5" +version="0.6.0-b6" # # myHomedir is used in full paths to the homedir From 718741e2eb3485fd7a8edac10f97382faac202dc Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 12 Jun 2020 17:42:08 +0200 Subject: [PATCH 221/261] add-apt-repository cache upd option fir ub2004 only --- core_functions.sh | 50 ++++++++++++++++++++++++++++++++++++++++------- 1 file changed, 43 insertions(+), 7 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 5399785..dbce40d 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -79,11 +79,11 @@ function pressKey () { } # -# check if OS is Mint 18 / Ubuntu 16.04 +# check if OS is Mint 18 # function isMint18 () { OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` - if [[ $OS == *"Linux Mint 18"* || $OS == *"Ubuntu 16.04"* ]]; then + if [[ $OS == *"Linux Mint 18"* ]]; then return 0 else return 1 @@ -91,11 +91,23 @@ function isMint18 () { } # -# check if OS is Mint 19 / Ubuntu 18.04 +# check if OS is Ubuntu 16.04 +# +function isUbuntu1604 () { + OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` + if [[ $OS == *"Ubuntu 16.04"* ]]; then + return 0 + else + return 1 + fi +} + +# +# check if OS is Mint 19 # function isMint19 () { OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` - if [[ $OS == *"Linux Mint 19"* || $OS == *"Ubuntu 18.04"* ]]; then + if [[ $OS == *"Linux Mint 19"* ]]; then return 0 else return 1 @@ -103,11 +115,35 @@ function isMint19 () { } # -# check if OS is Mint 20 / Ubuntu 20.04 +# check if OS is Ubuntu 18.04 +# +function isUbuntu1804 () { + OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` + if [[ $OS == *"Ubuntu 18.04"* ]]; then + return 0 + else + return 1 + fi +} + +# +# check if OS is Mint 20 # function isMint20 () { OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` - if [[ $OS == *"Linux Mint 20"* || $OS == *"Ubuntu 20.04"* ]]; then + if [[ $OS == *"Linux Mint 20"* ]]; then + return 0 + else + return 1 + fi +} + +# +# check if OS is Ubuntu 20.04 +# +function isUbuntu2004 () { + OS=`lsb_release -d | awk -F':' '{print $2}' | awk -F'\t' '{print $2}'` + if [[ $OS == *"Ubuntu 20.04"* ]]; then return 0 else return 1 @@ -213,7 +249,7 @@ function addPPA () { if ! grep ^ /etc/apt/sources.list /etc/apt/sources.list.d/* | grep -q ${str2search}; then printf "[PPA] adding : $* " printf "\n[PPA] adding $*\n" &>> $logFile - if isMint20; then + if isUbuntu2004; then sudo add-apt-repository -yn $* &>> $logFile else sudo add-apt-repository -y $* &>> $logFile From 9725f59668d985f650caa2a76f413405db527383 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 12 Jun 2020 17:42:43 +0200 Subject: [PATCH 222/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index b42d64f..0a03a15 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.0-b6" +version="0.6.0-b7" # # myHomedir is used in full paths to the homedir From fedb33271cece8c6356020edf33a4b411e4d1649 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Mon, 15 Jun 2020 10:48:12 +0200 Subject: [PATCH 223/261] all snap replaced with flatpak equivalent --- repo_functions_ub2004.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 52c12f5..2c6b57a 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -51,9 +51,9 @@ sysstat;apt;base;sysstat dcfldd;apt;base;dcfldd mdadm;apt;base;mdadm ncdu;apt;base;ncdu -spotify;snap;multimedia;spotify +com.spotify.Client;flatpak;multimedia;spotify qmmp;apt;multimedia;qmmp -shotcut;snap;multimedia;shotcut +org.shotcut.Shotcut;flatpak;multimedia;shotcut audacious;apt;multimedia;audacious dia;apt;multimedia;dia mpv;apt;multimedia;mpv @@ -129,7 +129,8 @@ vivaldi-stable;apt;internet;vivaldi-stable transmission-gtk;apt;internet;transmission-gtk youtube-dl;pip;internet;youtube-dl gallery-dl;pip;internet;gallery-dl -cawbird;apt;internet;cawbird +uk.co.ibboard.cawbird;flatpak;internet;cawbird +us.zoom.Zoom;flatpak;internet;zoom qtqr;apt;utilities;qtqr cpu-g;apt;utilities;cpu-g screenfetch;apt;utilities;screenfetch @@ -314,7 +315,7 @@ mycli;pip;dev;mycli sqlitebrowser;apt;dev;sqlitebrowser jq;apt;dev;jq tig;apt;dev;tig -postman;snap;dev;postman +com.getpostman.Postman;flatpak;dev;postman javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn emma-cli;npm;javascript;emma-cli @@ -367,7 +368,7 @@ calibre;apt;ebook;calibre android-studio;apt;androidstudio;androidstudio intellij-idea-community;snap;idea;idea eclipse;snap;eclipse;eclipse -gitkraken;snap;gitkraken;gitkraken +com.axosoft.GitKraken;flatpak;gitkraken;gitkraken linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04" #TODO From 077e23bcd53868c5f1c8d1dcd93cd7454c0a3d33 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Mon, 15 Jun 2020 11:11:51 +0200 Subject: [PATCH 224/261] cawbird installed by apt repo instead --- repo_functions_ub2004.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 2c6b57a..d37d0ec 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -129,7 +129,7 @@ vivaldi-stable;apt;internet;vivaldi-stable transmission-gtk;apt;internet;transmission-gtk youtube-dl;pip;internet;youtube-dl gallery-dl;pip;internet;gallery-dl -uk.co.ibboard.cawbird;flatpak;internet;cawbird +cawbird;apt;internet;cawbird us.zoom.Zoom;flatpak;internet;zoom qtqr;apt;utilities;qtqr cpu-g;apt;utilities;cpu-g @@ -498,6 +498,7 @@ function addRepo_Audacity () { # # Ubuntu Make #TODO : no focal support yet +# lyzardking ? # # function addRepo_UbuntuMake () { # addPPA ppa:ubuntu-desktop/ubuntu-make From dd2aa50bf4dbf61c54f0398691fdac8ac74b8ef0 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Mon, 15 Jun 2020 11:16:55 +0200 Subject: [PATCH 225/261] new ppa for umake --- repo_functions_ub2004.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index d37d0ec..08003b3 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -469,7 +469,8 @@ handbrake;addRepo_Handbrake kodi;addRepo_Kodi avidemux;addRepo_Avidemux winehq-stable;addRepo_WineHQ -audacity;addRepo_Audacity" +audacity;addRepo_Audacity +ubuntu-make;addRepo_UbuntuMake" #TODO : no focal support yet / or not needed yet #woeusb;addRepo_Webupd8 @@ -486,7 +487,6 @@ audacity;addRepo_Audacity" #wireshark;addRepo_WireShark #green-recorder;addRepo_GreenRecorder #mongodb;addRepo_MongoDB_CE -#ubuntu-make;addRepo_UbuntuMake #flatpak;addRepo_flatpak # @@ -497,12 +497,11 @@ function addRepo_Audacity () { } # -# Ubuntu Make #TODO : no focal support yet -# lyzardking ? +# Ubuntu Make # -# function addRepo_UbuntuMake () { -# addPPA ppa:ubuntu-desktop/ubuntu-make -# } +function addRepo_UbuntuMake () { + addPPA ppa:lyzardking/ubuntu-make +} # # Cawbird #TODO From 6b189bf12048d200e488f25b6fedeb7837f279b1 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Mon, 15 Jun 2020 11:22:13 +0200 Subject: [PATCH 226/261] . --- repo_functions_ub2004.sh | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 08003b3..18e4c10 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -103,13 +103,13 @@ kdenlive;apt;multimedia;kdenlive com.github.huluti.ImCompressor;flatpak;multimedia;ImCompressor flacon;apt;multimedia;flacon simplescreenrecorder;apt;multimedia;simplescreenrecorder -vidcutter;snap;multimedia;vidcutter +com.ozmartians.VidCutter;flatpak;multimedia;vidcutter syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync megasync;apt;internet;megasync megacmd;apt;internet;megacmd -discord;snap;internet;discord +com.discordapp.Discord;flatpak;internet;discord com.teamspeak.TeamSpeak;flatpak;internet;TeamSpeak quiterss;apt;internet;quiterss opera-stable;apt;internet;opera-stable @@ -175,10 +175,8 @@ fdupes;apt;utilities;fdupes balena-etcher-electron;apt;utilities;balena-etcher-electron org.gabmus.hydrapaper;flatpak;utilities;hydrapaper nvme-cli;apt;utilities;nvme-cli -translatium;snap;utilities;translatium font-manager;apt;utilities;font-manager gyazo;apt;utilities;gyazo -snap-store;snap;utilities;snap-store inxi;apt;utilities;inxi python3-dev;apt;python;python3-dev python3-pyqt5;apt;python;python3-pyqt5 @@ -340,7 +338,7 @@ codeblocks;apt;codeblocks;codeblocks codeblocks-contrib;apt;codeblocks;codeblocks-contrib geany;apt;geany;geany geany-plugins;apt;geany;geany-plugins -brackets;snap;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 @@ -367,16 +365,11 @@ fbreader;apt;ebook;fbreader calibre;apt;ebook;calibre android-studio;apt;androidstudio;androidstudio intellij-idea-community;snap;idea;idea -eclipse;snap;eclipse;eclipse com.axosoft.GitKraken;flatpak;gitkraken;gitkraken linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04" -#TODO -#OLD : wine-stable;apt;wine;wine-stable #TODO : no focal support yet #aptik;apt;utilities;aptik -#brackets;apt;brackets;brackets -#vidcutter;apt;multimedia;vidcutter #green-recorder;apt;multimedia;green-recorder #mongodb-org;apt;mongodb;mongodb From 234d1a2ed4ba90870db923ead267ddf5c1ac5c11 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Mon, 15 Jun 2020 15:07:16 +0200 Subject: [PATCH 227/261] . --- repo_functions_ub1804.sh | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 1c50580..30fe3c7 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -52,11 +52,11 @@ sysstat;apt;base;sysstat dcfldd;apt;base;dcfldd mdadm;apt;base;mdadm ncdu;apt;base;ncdu -spotify;snap;multimedia;spotify +com.spotify.Client;flatpak;multimedia;spotify sayonara;apt;multimedia;sayonara qmmp;apt;multimedia;qmmp qmmp-plugin-projectm;apt;multimedia;qmmp-plugin-projectm -shotcut;snap;multimedia;shotcut +org.shotcut.Shotcut;flatpak;multimedia;shotcut audacious;apt;multimedia;audacious dia;apt;multimedia;dia mpv;apt;multimedia;mpv @@ -122,7 +122,7 @@ syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync megasync;apt;internet;megasync megacmd;apt;internet;megacmd -discord;snap;internet;discord +com.discordapp.Discord;flatpak;internet;discord com.teamspeak.TeamSpeak;flatpak;internet;TeamSpeak quiterss;apt;internet;quiterss opera-stable;apt;internet;opera-stable @@ -146,6 +146,7 @@ youtube-dl;pip;internet;youtube-dl youtube-dlg;apt;internet;youtube-dlg gallery-dl;pip;internet;gallery-dl cawbird;apt;internet;cawbird +us.zoom.Zoom;flatpak;internet;zoom qtqr;apt;utilities;qtqr cpu-g;apt;utilities;cpu-g screenfetch;apt;utilities;screenfetch @@ -194,7 +195,6 @@ fdupes;apt;utilities;fdupes balena-etcher-electron;apt;utilities;balena-etcher-electron org.gabmus.hydrapaper;flatpak;utilities;hydrapaper nvme-cli;apt;utilities;nvme-cli -translatium;snap;utilities;translatium font-manager;apt;utilities;font-manager python3-dev;apt;python;python3-dev python3-pyqt5;apt;python;python3-pyqt5 @@ -340,7 +340,7 @@ sqlitebrowser;apt;dev;sqlitebrowser mysql-workbench;apt;dev;mysql-workbench jq;apt;dev;jq tig;apt;dev;tig -postman;snap;dev;postman +com.getpostman.Postman;flatpak;dev;postman javascript-common;apt;javascript;javascript-common yarn;npm;javascript;yarn emma-cli;npm;javascript;emma-cli @@ -396,8 +396,7 @@ fbreader;apt;ebook;fbreader calibre;apt;ebook;calibre android-studio;apt;androidstudio;androidstudio intellij-idea-community;snap;idea;idea -eclipse;snap;eclipse;eclipse -gitkraken;snap;gitkraken;gitkraken +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 linux-generic-hwe-18.04;apt;hwe;linux-generic-hwe-18.04" From 7ce79a6d91ff1247a2ad20f268d84050a06d79dd Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 17 Jun 2020 18:45:27 +0200 Subject: [PATCH 228/261] entangle 2->3 for both branches --- repo_functions_ub1804.sh | 3 +-- repo_functions_ub2004.sh | 14 +++++++------- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 30fe3c7..d12a67c 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -102,7 +102,7 @@ simplescreenrecorder-lib:i386;apt;multimedia;simplescreenrecorder-lib:i386 cuetools;apt;multimedia;cuetools shntool;apt;multimedia;shntool flac;apt;multimedia;flac -entangle;apt;multimedia;entangle +org.entangle_photo.Manager;flatpak;multimedia;entangle krita;apt;multimedia;krita soundconverter;apt;multimedia;soundconverter gimp;apt;multimedia;gimp @@ -497,7 +497,6 @@ rhythmbox-plugin-suspend;addRepo_Rhythmbox rhythmbox-plugin-wikipedia;addRepo_Rhythmbox rhythmbox-plugins;addRepo_Rhythmbox rawtherapee;addRepo_DhorMyWay -entangle;addRepo_DhorMyWay mkvtoolnix-gui;addRepo_MKVToolnix purple-facebook;addRepo_Jgeboski audacious;addRepo_Webupd8 diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 18e4c10..a8b81b6 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -92,7 +92,7 @@ webp;apt;multimedia;webp cuetools;apt;multimedia;cuetools shntool;apt;multimedia;shntool flac;apt;multimedia;flac -entangle;apt;multimedia;entangle +org.entangle_photo.Manager;flatpak;multimedia;entangle krita;apt;multimedia;krita soundconverter;apt;multimedia;soundconverter gimp;apt;multimedia;gimp @@ -427,8 +427,6 @@ rhythmbox-plugin-spectrum;addRepo_Rhythmbox rhythmbox-plugin-suspend;addRepo_Rhythmbox rhythmbox-plugin-wikipedia;addRepo_Rhythmbox rhythmbox-plugins;addRepo_Rhythmbox -rawtherapee;addRepo_DhorMyWay -entangle;addRepo_DhorMyWay audacious;addRepo_Webupd8 qt5ct;addRepo_Webupd8 screenkey;addRepo_Webupd8 @@ -466,6 +464,8 @@ audacity;addRepo_Audacity ubuntu-make;addRepo_UbuntuMake" #TODO : no focal support yet / or not needed yet +#rawtherapee;addRepo_DhorMyWay +#entangle;addRepo_DhorMyWay #woeusb;addRepo_Webupd8 #selene;addRepo_Teejee2008 #youtube-dlg;addRepo_Webupd8 @@ -635,11 +635,11 @@ function addRepo_MKVToolnix () { } # -# Entangle, Rawtherapee +# Entangle, Rawtherapee #TODO : no focal support yet ? # -function addRepo_DhorMyWay () { - addPPA ppa:dhor/myway -} +# function addRepo_DhorMyWay () { +# addPPA ppa:dhor/myway +# } # # Rhythmbox From 6e42e3f9c14870020a1e8e38848be2e5b9cd49f6 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 17 Jun 2020 18:45:45 +0200 Subject: [PATCH 229/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 0a03a15..4b36251 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.0-b7" +version="0.6.0-b8" # # myHomedir is used in full paths to the homedir From e807282d92024b8e1a86cab2e0b6f2efbaf84391 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 1 Jul 2020 14:16:35 +0200 Subject: [PATCH 230/261] Franz removed --- install_functions_ub1804.sh | 18 ------------------ install_functions_ub2004.sh | 18 ------------------ menus_functions_ub1804.sh | 4 ---- menus_functions_ub2004.sh | 4 ---- vars.sh | 2 +- yggdrasil.sh | 2 -- 6 files changed, 1 insertion(+), 47 deletions(-) diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 7faee63..7a4a3a0 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -34,24 +34,6 @@ function installViberMenu () { yes } -# -# Franz (headless) -# -function installFranz () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.4.0/franz_5.4.0_amd64.deb \ - franz.deb \ - no -} - -# -# Franz (Menu) -# -function installFranzMenu () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.4.0/franz_5.4.0_amd64.deb \ - franz.deb \ - yes -} - # # Slack (headless) # diff --git a/install_functions_ub2004.sh b/install_functions_ub2004.sh index 5de9195..7b53f19 100644 --- a/install_functions_ub2004.sh +++ b/install_functions_ub2004.sh @@ -34,24 +34,6 @@ function installViberMenu () { yes } -# -# Franz (headless) -# -function installFranz () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.4.0/franz_5.4.0_amd64.deb \ - franz.deb \ - no -} - -# -# Franz (Menu) -# -function installFranzMenu () { - installPackageDpkg https://github.com/meetfranz/franz/releases/download/v5.4.0/franz_5.4.0_amd64.deb \ - franz.deb \ - yes -} - # # Slack (headless) # diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index f7c9de9..6a63cfc 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -337,7 +337,6 @@ function showAppInstallMenu () { "nitrogen" "Nitrogen WP Manager" \ "wine" "Wine Builds" \ "viber" "Viber IM desktop app" \ - "franz" "Franz multi IM app" \ "slack" "Slack App" \ "appimagelauncher" "AppImage Launcher" \ "xnviewmp" "XNView MP" \ @@ -401,9 +400,6 @@ function showAppInstallMenu () { "viber") installViberMenu ;; - "franz") - installFranzMenu - ;; "slack") installSlackMenu ;; diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index 62dbc2e..9a7c081 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -337,7 +337,6 @@ function showAppInstallMenu () { "nitrogen" "Nitrogen WP Manager" \ "wine" "Wine Builds" \ "viber" "Viber IM desktop app" \ - "franz" "Franz multi IM app" \ "slack" "Slack App" \ "appimagelauncher" "AppImage Launcher" \ "xnviewmp" "XNView MP" \ @@ -401,9 +400,6 @@ function showAppInstallMenu () { "viber") installViberMenu ;; - "franz") - installFranzMenu - ;; "slack") installSlackMenu ;; diff --git a/vars.sh b/vars.sh index 4b36251..06a26f5 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.0-b8" +version="0.6.0-b9" # # myHomedir is used in full paths to the homedir diff --git a/yggdrasil.sh b/yggdrasil.sh index a097f53..2375f90 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -107,7 +107,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do installUnattendedUpgrades msg "Installing external apps" installViber - installFranz installBoostnotes installTeamViewer13 installXnViewMP @@ -156,7 +155,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,k,p" option; do installAppsFromList gtkthemes msg "Installing external apps" installViber - installFranz installBoostnotes installTeamViewer13 installXnViewMP From 083be085467a4877557fba676f94405730b07e62 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Thu, 2 Jul 2020 16:21:17 +0200 Subject: [PATCH 231/261] Pixelorama added --- repo_functions_ub2004.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index a8b81b6..8454ed6 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -104,6 +104,7 @@ com.github.huluti.ImCompressor;flatpak;multimedia;ImCompressor flacon;apt;multimedia;flacon simplescreenrecorder;apt;multimedia;simplescreenrecorder com.ozmartians.VidCutter;flatpak;multimedia;vidcutter +com.orama_interactive.Pixelorama;flatpak;multimedia;pixelorama syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync From e712e67e46c1e524b9a6b95b25e833b186a21b6a Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 19:25:35 +0200 Subject: [PATCH 232/261] Install/unlock snap+store moved as unrecommanded opt + misc minor changes --- core_functions.sh | 4 ++++ menus_functions_ub1804.sh | 4 ++++ menus_functions_ub2004.sh | 4 ++++ repo_functions_ub1804.sh | 9 ++++----- repo_functions_ub2004.sh | 9 ++++----- vars.sh | 2 +- yggdrasil.sh | 13 ++++++++++++- 7 files changed, 33 insertions(+), 12 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index dbce40d..771d26b 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -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" diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 6a63cfc..d43dfac 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -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 ;; diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index 9a7c081..4f0524d 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -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 ;; diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index d12a67c..139c8f5 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -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 diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 8454ed6..61893e1 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -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" diff --git a/vars.sh b/vars.sh index 06a26f5..13f88f3 100644 --- a/vars.sh +++ b/vars.sh @@ -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 diff --git a/yggdrasil.sh b/yggdrasil.sh index 2375f90..563311d 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -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 From 92c42572f9393a814dbd99eaea34bf333b4f3f54 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 19:31:30 +0200 Subject: [PATCH 233/261] unattended-upgrades moved in apps list and as cli opt --- menus_functions_ub1804.sh | 2 +- menus_functions_ub2004.sh | 2 +- repo_functions_ub1804.sh | 3 ++- repo_functions_ub2004.sh | 3 ++- tools_functions.sh | 7 ------- yggdrasil.sh | 13 ++++++++++++- 6 files changed, 18 insertions(+), 12 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index d43dfac..70cffd9 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -93,7 +93,7 @@ function showConfigMenu () { ;; "unattendedUpgrades") clear - installUnattendedUpgrades + installAppsFromList unattended-upgrades pressKey ;; "Unbound") diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index 4f0524d..4b096bb 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -93,7 +93,7 @@ function showConfigMenu () { ;; "unattendedUpgrades") clear - installUnattendedUpgrades + installAppsFromList unattended-upgrades pressKey ;; "Unbound") diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 139c8f5..7e18c00 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -20,7 +20,8 @@ # List of packages available # fields : package name, package manager, category, unique ID for external functions # -Apps="snapd;apt;snap;snapd +Apps="unattended-upgrades;apt;unattended-upgrades;unattended-upgrades +snapd;apt;snap;snapd snap-store;snap;snap;snap-store apt-transport-https;apt;init;apt-transport-https flatpak;apt;init;flatpak diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 61893e1..76b9146 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -20,7 +20,8 @@ # List of packages available # fields : package name, package manager, category, unique ID for external functions # -Apps="snapd;apt;snap;snapd +Apps="unattended-upgrades;apt;unattended-upgrades;unattended-upgrades +snapd;apt;snap;snapd snap-store;snap;snap;snap-store apt-transport-https;apt;init;apt-transport-https flatpak;apt;init;flatpak diff --git a/tools_functions.sh b/tools_functions.sh index 52afd4c..bce53e7 100644 --- a/tools_functions.sh +++ b/tools_functions.sh @@ -71,13 +71,6 @@ function enableHistoryTS () { retCode $ret_code } -# -# install/enable auto install of security updates -# -function installUnattendedUpgrades () { - installPackage apt unattended-upgrades -} - # # display useful system/hardware informations # diff --git a/yggdrasil.sh b/yggdrasil.sh index 563311d..98c649e 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -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,g,k,p" option; do +while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do case "$option" in a) # install all apps if [ $ygginitCount = false ]; then @@ -249,6 +249,17 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,k,p" option; do msg "Unlock/Install SNAP + Store" installAppsFromList snap ;; + j) # unattended-upgrades + if [ $ygginitCount = false ]; then + msg "Initializing" + yggInit + msg "Updating the system" + updateSystem + ygginitCount=true + fi + msg "Install/Enable unattended-upgrades" + installAppsFromList unattended-upgrades + ;; u) msg "Initializing" yggInit From 87136c0fb6fd0770d398db1f9d032fab93b3dc9a Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 19:36:02 +0200 Subject: [PATCH 234/261] enablement/rules for ufw added as PostTrtFct --- menus_functions_ub1804.sh | 6 ------ menus_functions_ub2004.sh | 5 ----- repo_functions_ub1804.sh | 16 +++++++++++++++- repo_functions_ub2004.sh | 16 +++++++++++++++- tools_functions.sh | 13 ------------- 5 files changed, 30 insertions(+), 26 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 70cffd9..9808c51 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -57,7 +57,6 @@ function showConfigMenu () { --menu "System Config" \ 25 80 16 \ "Ufw" "Enable Firewall (ufw)" \ - "NumLockX" "NumLock Enabled at boot time" \ "TmpRAM" "/tmp stored in RAM" \ "screenfetch" "screenfetch added to .bashrc" \ "historyTS" "TimeStamp enabled in Shell History" \ @@ -71,11 +70,6 @@ function showConfigMenu () { enableUFW pressKey ;; - "NumLockX") - clear - enableNumLockX - pressKey - ;; "TmpRAM") clear enableTmpRAM diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index 4b096bb..e05893b 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -71,11 +71,6 @@ function showConfigMenu () { enableUFW pressKey ;; - "NumLockX") - clear - enableNumLockX - pressKey - ;; "TmpRAM") clear enableTmpRAM diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 7e18c00..4e5c8fa 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1142,7 +1142,21 @@ megasync;megasync_PostTrtFct flatpak;flatpak_PostTrtFct gcc8;gcc8_PostTrtFct ruby-dev;ruby-dev_PostTrtFct -virtualbox-6.1;virtualbox-6.1_PostTrtFct" +virtualbox-6.1;virtualbox-6.1_PostTrtFct +numlockx;numlockx_PostTrtFct" + +# +# numlockx +# +function numlockx_PostTrtFct () { + runCmd "sudo ufw enable"\ + "enabling UFW at boot" + + if which syncthing >/dev/null; then + runCmd "sudo ufw allow syncthing" \ + "adding UFW rules for Syncthing" + fi +} # # virtualbox-6.1 diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 76b9146..0209bf2 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -1022,7 +1022,21 @@ dockerio;dockerio_PostTrtFct megasync;megasync_PostTrtFct flatpak;flatpak_PostTrtFct ruby-dev;ruby-dev_PostTrtFct -virtualbox;virtualbox_PostTrtFct" +virtualbox;virtualbox_PostTrtFct +numlockx;numlockx_PostTrtFct" + +# +# numlockx +# +function numlockx_PostTrtFct () { + runCmd "sudo ufw enable"\ + "enabling UFW at boot" + + if which syncthing >/dev/null; then + runCmd "sudo ufw allow syncthing" \ + "adding UFW rules for Syncthing" + fi +} # # virtualbox diff --git a/tools_functions.sh b/tools_functions.sh index bce53e7..6d0aa22 100644 --- a/tools_functions.sh +++ b/tools_functions.sh @@ -10,19 +10,6 @@ # tools and config functions # #-----------------------------------------------------------------------------# -# -# enable ufw at boot time and add rules for installed apps -# -function enableUFW () { - runCmd "sudo ufw enable"\ - "enabling UFW at boot" - - if which syncthing >/dev/null; then - runCmd "sudo ufw allow syncthing" \ - "adding UFW rules for Syncthing" - fi -} - # # enable numlock by default on LightDM # From 2d3ba2fb2e163b86a5f5e95280e4934bedabc5df Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 19:41:32 +0200 Subject: [PATCH 235/261] enablement/rules for ufw added as PostTrtFct --- repo_functions_ub1804.sh | 6 +++--- repo_functions_ub2004.sh | 6 +++--- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 4e5c8fa..09db7ab 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1143,12 +1143,12 @@ flatpak;flatpak_PostTrtFct gcc8;gcc8_PostTrtFct ruby-dev;ruby-dev_PostTrtFct virtualbox-6.1;virtualbox-6.1_PostTrtFct -numlockx;numlockx_PostTrtFct" +gufw;gufw_PostTrtFct" # -# numlockx +# ufw enablement + add rules # -function numlockx_PostTrtFct () { +function gufw_PostTrtFct () { runCmd "sudo ufw enable"\ "enabling UFW at boot" diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 0209bf2..c3491c8 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -1023,12 +1023,12 @@ megasync;megasync_PostTrtFct flatpak;flatpak_PostTrtFct ruby-dev;ruby-dev_PostTrtFct virtualbox;virtualbox_PostTrtFct -numlockx;numlockx_PostTrtFct" +gufw;gufw_PostTrtFct" # -# numlockx +# ufw enablement + add rules # -function numlockx_PostTrtFct () { +function gufw_PostTrtFct () { runCmd "sudo ufw enable"\ "enabling UFW at boot" From 194e695b8a33047fcff2b9e75159b9363ada6ccd Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 19:46:16 +0200 Subject: [PATCH 236/261] numlockx enable for lightdm as PostTrtFct --- menus_functions_ub1804.sh | 6 ------ menus_functions_ub2004.sh | 7 ------- repo_functions_ub1804.sh | 17 ++++++++++++++++- repo_functions_ub2004.sh | 17 ++++++++++++++++- tools_functions.sh | 15 --------------- yggdrasil.sh | 6 ------ 6 files changed, 32 insertions(+), 36 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 9808c51..0fe51c3 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -56,7 +56,6 @@ function showConfigMenu () { --title "Yggdrasil $version - System Config" \ --menu "System Config" \ 25 80 16 \ - "Ufw" "Enable Firewall (ufw)" \ "TmpRAM" "/tmp stored in RAM" \ "screenfetch" "screenfetch added to .bashrc" \ "historyTS" "TimeStamp enabled in Shell History" \ @@ -65,11 +64,6 @@ function showConfigMenu () { "Back" "Back" 3>&1 1>&2 2>&3) case $configMenuOptions in - "Ufw") - clear - enableUFW - pressKey - ;; "TmpRAM") clear enableTmpRAM diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index e05893b..251103a 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -56,8 +56,6 @@ function showConfigMenu () { --title "Yggdrasil $version - System Config" \ --menu "System Config" \ 25 80 16 \ - "Ufw" "Enable Firewall (ufw)" \ - "NumLockX" "NumLock Enabled at boot time" \ "TmpRAM" "/tmp stored in RAM" \ "screenfetch" "screenfetch added to .bashrc" \ "historyTS" "TimeStamp enabled in Shell History" \ @@ -66,11 +64,6 @@ function showConfigMenu () { "Back" "Back" 3>&1 1>&2 2>&3) case $configMenuOptions in - "Ufw") - clear - enableUFW - pressKey - ;; "TmpRAM") clear enableTmpRAM diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 09db7ab..0926c32 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1143,7 +1143,22 @@ flatpak;flatpak_PostTrtFct gcc8;gcc8_PostTrtFct ruby-dev;ruby-dev_PostTrtFct virtualbox-6.1;virtualbox-6.1_PostTrtFct -gufw;gufw_PostTrtFct" +gufw;gufw_PostTrtFct +numlockx;numlockx_PostTrtFct" + +# +# numlockx +# +function numlockx_PostTrtFct () { + if which lightdm >/dev/null; then + runCmd "sudo touch /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \ + "creating lightdm config file if necessary" + runCmd "sudo cp /etc/lightdm/lightdm.conf.d/70-linuxmint.conf /etc/lightdm/lightdm.conf.d/70-linuxmint.conf.yggbak" \ + "backing up lightdm original config file" + runCmd "echo -e '\ngreeter-setup-script=/usr/bin/numlockx on' | sudo tee -a /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \ + "enabling numlockx on in lightdm at boot" + fi +} # # ufw enablement + add rules diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index c3491c8..dceed51 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -1023,7 +1023,22 @@ megasync;megasync_PostTrtFct flatpak;flatpak_PostTrtFct ruby-dev;ruby-dev_PostTrtFct virtualbox;virtualbox_PostTrtFct -gufw;gufw_PostTrtFct" +gufw;gufw_PostTrtFct +numlockx;numlockx_PostTrtFct" + +# +# numlockx +# +function numlockx_PostTrtFct () { + if which lightdm >/dev/null; then + runCmd "sudo touch /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \ + "creating lightdm config file if necessary" + runCmd "sudo cp /etc/lightdm/lightdm.conf.d/70-linuxmint.conf /etc/lightdm/lightdm.conf.d/70-linuxmint.conf.yggbak" \ + "backing up lightdm original config file" + runCmd "echo -e '\ngreeter-setup-script=/usr/bin/numlockx on' | sudo tee -a /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \ + "enabling numlockx on in lightdm at boot" + fi +} # # ufw enablement + add rules diff --git a/tools_functions.sh b/tools_functions.sh index 6d0aa22..aebf159 100644 --- a/tools_functions.sh +++ b/tools_functions.sh @@ -10,21 +10,6 @@ # tools and config functions # #-----------------------------------------------------------------------------# -# -# enable numlock by default on LightDM -# -function enableNumLockX () { - checkAndInstallDep apt numlockx numlockx - if which lightdm >/dev/null; then - runCmd "sudo touch /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \ - "creating lightdm config file if necessary" - runCmd "sudo cp /etc/lightdm/lightdm.conf.d/70-linuxmint.conf /etc/lightdm/lightdm.conf.d/70-linuxmint.conf.yggbak" \ - "backing up lightdm original config file" - runCmd "echo -e '\ngreeter-setup-script=/usr/bin/numlockx on' | sudo tee -a /etc/lightdm/lightdm.conf.d/70-linuxmint.conf" \ - "enabling numlockx on in lightdm at boot" - fi -} - # # /tmp in RAM by modifying /etc/fstab #TODO: add possibily to choose amount of ram diff --git a/yggdrasil.sh b/yggdrasil.sh index 98c649e..f3bab4a 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -100,11 +100,8 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do installAppsFromList webcam updateMicrocode msg "Applying system customizations" - enableUFW - enableNumLockX addScreenfetchBashrc enableHistoryTS - installUnattendedUpgrades msg "Installing external apps" installViber installBoostnotes @@ -144,11 +141,8 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do updateMicrocode installAppsFromList cardreader msg "Applying system customizations" - enableUFW - enableNumLockX addScreenfetchBashrc enableHistoryTS - installUnattendedUpgrades installAppsFromList unbound msg "Installing additional themes/icons" installAppsFromList icons From 74fbe087f85a3a3d055820aea34351ba4334afd8 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 19:48:42 +0200 Subject: [PATCH 237/261] . --- core_functions.sh | 1 + vars.sh | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/core_functions.sh b/core_functions.sh index 771d26b..bfa8891 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -621,6 +621,7 @@ function usage () { 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"-j"$NORMAL" : install/enable unattended-upgrades (security auto update))\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" diff --git a/vars.sh b/vars.sh index 13f88f3..1f306b5 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b1" +version="0.6.1-b2" # # myHomedir is used in full paths to the homedir From 15c843106ee15d79e6a6c62d642668d54224132d Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 19:49:34 +0200 Subject: [PATCH 238/261] . --- vars.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/vars.sh b/vars.sh index 1f306b5..7583959 100644 --- a/vars.sh +++ b/vars.sh @@ -41,7 +41,6 @@ repoAdded=0 # ygginitCount=false - # # shell color codes # From 92c52d9d41edd4b719cf0b7c36bf32c91b51364d Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 19:53:00 +0200 Subject: [PATCH 239/261] add screenfetch to .bashrc as PostTrtFct --- menus_functions_ub1804.sh | 5 ----- menus_functions_ub2004.sh | 5 ----- repo_functions_ub1804.sh | 13 ++++++++++++- repo_functions_ub2004.sh | 13 ++++++++++++- tools_functions.sh | 11 ----------- yggdrasil.sh | 2 -- 6 files changed, 24 insertions(+), 25 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 0fe51c3..ac74287 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -69,11 +69,6 @@ function showConfigMenu () { enableTmpRAM pressKey ;; - "screenfetch") - clear - addScreenfetchBashrc - pressKey - ;; "historyTS") clear enableHistoryTS diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index 251103a..4c81581 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -69,11 +69,6 @@ function showConfigMenu () { enableTmpRAM pressKey ;; - "screenfetch") - clear - addScreenfetchBashrc - pressKey - ;; "historyTS") clear enableHistoryTS diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 0926c32..6aeec8e 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1144,7 +1144,18 @@ gcc8;gcc8_PostTrtFct ruby-dev;ruby-dev_PostTrtFct virtualbox-6.1;virtualbox-6.1_PostTrtFct gufw;gufw_PostTrtFct -numlockx;numlockx_PostTrtFct" +numlockx;numlockx_PostTrtFct +screenfetch;screenfetch_PostTrtFct" + +# +# screenfetch in .bashrc +# +function screenfetch_PostTrtFct () { + runCmd "touch /home/$myHomedir/.bashrc" \ + "creating .bashrc file if necessary" + runCmd "echo 'screenfetch -t' | tee -a /home/$myHomedir/.bashrc" \ + "adding screenfetch to .bashrc" +} # # numlockx diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index dceed51..f7a54c4 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -1024,7 +1024,18 @@ flatpak;flatpak_PostTrtFct ruby-dev;ruby-dev_PostTrtFct virtualbox;virtualbox_PostTrtFct gufw;gufw_PostTrtFct -numlockx;numlockx_PostTrtFct" +numlockx;numlockx_PostTrtFct +screenfetch;screenfetch_PostTrtFct" + +# +# screenfetch in .bashrc +# +function screenfetch_PostTrtFct () { + runCmd "touch /home/$myHomedir/.bashrc" \ + "creating .bashrc file if necessary" + runCmd "echo 'screenfetch -t' | tee -a /home/$myHomedir/.bashrc" \ + "adding screenfetch to .bashrc" +} # # numlockx diff --git a/tools_functions.sh b/tools_functions.sh index aebf159..90ad8f5 100644 --- a/tools_functions.sh +++ b/tools_functions.sh @@ -21,17 +21,6 @@ function enableTmpRAM () { fi } -# -# add screenfetch exec in .bashrc -# -function addScreenfetchBashrc () { - checkAndInstallDep apt screenfetch screenfetch - runCmd "touch /home/$myHomedir/.bashrc" \ - "creating .bashrc file if necessary" - runCmd "echo 'screenfetch -t' | tee -a /home/$myHomedir/.bashrc" \ - "adding screenfetch to .bashrc" -} - # # cli history cmd timestamp enable # diff --git a/yggdrasil.sh b/yggdrasil.sh index f3bab4a..a56e6fa 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -100,7 +100,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do installAppsFromList webcam updateMicrocode msg "Applying system customizations" - addScreenfetchBashrc enableHistoryTS msg "Installing external apps" installViber @@ -141,7 +140,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do updateMicrocode installAppsFromList cardreader msg "Applying system customizations" - addScreenfetchBashrc enableHistoryTS installAppsFromList unbound msg "Installing additional themes/icons" From 9635ddbc8d57b7576742561c68a81ebf9c473519 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 19:56:41 +0200 Subject: [PATCH 240/261] typo --- core_functions.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core_functions.sh b/core_functions.sh index bfa8891..515d796 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -624,7 +624,7 @@ function usage () { printf " "$BOLDVERT"-j"$NORMAL" : install/enable unattended-upgrades (security auto update))\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" + printf " "$BOLDVERT"-v"$NORMAL" : show version number\n" printf " "$BOLDVERT"-h"$NORMAL" : show help & informations\n" printf "\n" } From f8b457bf845983bb052d775927a02fe77ef6a142 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 20:44:45 +0200 Subject: [PATCH 241/261] remove old stuff ;) --- install_functions_ub1804.sh | 12 ------------ install_functions_ub2004.sh | 12 ------------ menus_functions_ub1804.sh | 5 ----- menus_functions_ub2004.sh | 5 ----- 4 files changed, 34 deletions(-) diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 7a4a3a0..6a0327d 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -92,18 +92,6 @@ function updateMicrocode () { printf "\n" } -# -# fix some config issue with Intel Wireless 6320 cards -# -function fixWirelessIntel6320 () { - runCmd "sudo cp /etc/modprobe.d/iwlwifi.conf /etc/modprobe.d/iwlwifi.conf.bak" \ - "backing up config file" - runCmd "echo options iwlwifi bt_coex_active=0 swcrypto=1 11n_disable=8 | sudo tee /etc/modprobe.d/iwlwifi.conf" \ - "applying new config" - printf "[INFO] reboot required !!!" - printf "\n" -} - # # Key-ID USB Fido U2F device udev rules # diff --git a/install_functions_ub2004.sh b/install_functions_ub2004.sh index 7b53f19..d2b658b 100644 --- a/install_functions_ub2004.sh +++ b/install_functions_ub2004.sh @@ -92,18 +92,6 @@ function updateMicrocode () { printf "\n" } -# -# fix some config issue with Intel Wireless 6320 cards -# -function fixWirelessIntel6320 () { - runCmd "sudo cp /etc/modprobe.d/iwlwifi.conf /etc/modprobe.d/iwlwifi.conf.bak" \ - "backing up config file" - runCmd "echo options iwlwifi bt_coex_active=0 swcrypto=1 11n_disable=8 | sudo tee /etc/modprobe.d/iwlwifi.conf" \ - "applying new config" - printf "[INFO] reboot required !!!" - printf "\n" -} - # # Key-ID USB Fido U2F device udev rules # diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index ac74287..5a595e1 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -421,7 +421,6 @@ function showHardwareMenu () { "microcode" "Update Intel/AMD CPU microcode" \ "tlp" "Install/Enable TLP for better power management " \ "keyid" "Add udev rules for Key-ID FIDO U2F usb key" \ - "WI6320" "Fix Intel Wireless 6320 card config problem" \ "Back" "Back" 3>&1 1>&2 2>&3) case $hardwareMenuOptions in @@ -448,10 +447,6 @@ function showHardwareMenu () { installKeyIDuDev pressKey ;; - "WI6320") - fixWirelessIntel6320 - pressKey - ;; "Back") break ;; diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index 4c81581..735bcb8 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -421,7 +421,6 @@ function showHardwareMenu () { "microcode" "Update Intel/AMD CPU microcode" \ "tlp" "Install/Enable TLP for better power management " \ "keyid" "Add udev rules for Key-ID FIDO U2F usb key" \ - "WI6320" "Fix Intel Wireless 6320 card config problem" \ "Back" "Back" 3>&1 1>&2 2>&3) case $hardwareMenuOptions in @@ -448,10 +447,6 @@ function showHardwareMenu () { installKeyIDuDev pressKey ;; - "WI6320") - fixWirelessIntel6320 - pressKey - ;; "Back") break ;; From 061eb95cabe84c648386bb930679d17a6c841b68 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 4 Jul 2020 21:02:53 +0200 Subject: [PATCH 242/261] minor improvements --- core_functions.sh | 3 +-- repo_functions_ub1804.sh | 8 ++++---- repo_functions_ub2004.sh | 8 ++++---- 3 files changed, 9 insertions(+), 10 deletions(-) diff --git a/core_functions.sh b/core_functions.sh index 515d796..6a6089c 100644 --- a/core_functions.sh +++ b/core_functions.sh @@ -320,8 +320,7 @@ function installPackageDpkg () { printf "\n[PKG] installing $2 from $1\n" &>> $logFile cd /tmp \ && wget -q -O $2 $1 &>> $logFile \ - && sudo dpkg -i $2 &>> $logFile - sudo apt-get install -fy &>> $logFile + && sudo apt-get install -fy /tmp/$2 &>> $logFile ret_code=$? retCode $ret_code if [ "$3" == "yes" ]; then diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 6aeec8e..a981c9f 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -20,10 +20,7 @@ # List of packages available # fields : package name, package manager, category, unique ID for external functions # -Apps="unattended-upgrades;apt;unattended-upgrades;unattended-upgrades -snapd;apt;snap;snapd -snap-store;snap;snap;snap-store -apt-transport-https;apt;init;apt-transport-https +Apps="apt-transport-https;apt;init;apt-transport-https flatpak;apt;init;flatpak ubuntu-make;apt;init;ubuntu-make gcc-8 g++-8;apt;init;gcc8 @@ -33,6 +30,9 @@ python3-pip;apt;init;python3-pip python3-distutils;apt;init;python3-distutils pip;pip;init;setuptools setuptools;pip;init;setuptools +unattended-upgrades;apt;unattended-upgrades;unattended-upgrades +snapd;apt;snap;snapd +snap-store;snap;snap;snap-store cifs-utils;apt;base;cifs-utils xterm;apt;base;xterm curl;apt;base;curl diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index f7a54c4..019b3c8 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -20,10 +20,7 @@ # List of packages available # fields : package name, package manager, category, unique ID for external functions # -Apps="unattended-upgrades;apt;unattended-upgrades;unattended-upgrades -snapd;apt;snap;snapd -snap-store;snap;snap;snap-store -apt-transport-https;apt;init;apt-transport-https +Apps="apt-transport-https;apt;init;apt-transport-https flatpak;apt;init;flatpak ubuntu-make;apt;init;ubuntu-make ruby-dev;apt;init;ruby-dev @@ -32,6 +29,9 @@ python3-pip;apt;init;python3-pip python3-distutils;apt;init;python3-distutils pip;pip;init;setuptools setuptools;pip;init;setuptools +unattended-upgrades;apt;unattended-upgrades;unattended-upgrades +snapd;apt;snap;snapd +snap-store;snap;snap;snap-store cifs-utils;apt;base;cifs-utils xterm;apt;base;xterm curl;apt;base;curl From 15ee4b873ac384f1902818fc0af4fafdb3314774 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 8 Jul 2020 21:15:48 +0200 Subject: [PATCH 243/261] chromium removed from 20.04 branch as it's transitional fake trojan package ;) --- repo_functions_ub2004.sh | 2 -- 1 file changed, 2 deletions(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 019b3c8..584213a 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -118,8 +118,6 @@ com.teamspeak.TeamSpeak;flatpak;internet;TeamSpeak quiterss;apt;internet;quiterss opera-stable;apt;internet;opera-stable google-chrome-stable;apt;internet;google-chrome-stable -chromium-browser;apt;internet;chromium-browser -chromium-browser-l10n;apt;internet;chromium-browser-l10n filezilla;apt;internet;filezilla hexchat;apt;internet;hexchat mumble;apt;internet;mumble From 20f215a723cc02492ac345b77e12e0aa8430ce25 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 8 Jul 2020 21:32:39 +0200 Subject: [PATCH 244/261] some minor fixes --- menus_functions_ub1804.sh | 16 ---------------- menus_functions_ub2004.sh | 20 -------------------- vars.sh | 2 +- 3 files changed, 1 insertion(+), 37 deletions(-) diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 5a595e1..c828e5a 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -186,10 +186,6 @@ function showDevInstallMenu () { "brackets" "Brackets" \ "codeblocks" "CodeBlocks" \ "geany" "Geany" \ - "idea" "Idea" \ - "eclipse" "Eclipse" \ - "pycharmprofessional" "PyCharm Professional edition" \ - "pycharmcommunity" "PyCharm Community edition" \ "vsc" "Visual Studio Code" \ "androidstudio" "Android Studio" \ "sublimetext" "Sublime Text" \ @@ -244,18 +240,6 @@ function showDevInstallMenu () { "geany") installAppsFromListMenu geany ;; - "idea") - installAppsFromListMenu idea - ;; - "eclipse") - installAppsFromListMenu eclipse - ;; - "pycharmprofessional") - installAppsFromListMenu pycharm-professional - ;; - "pycharmcommunity") - installAppsFromListMenu pycharm-community - ;; "vsc") installAppsFromListMenu code ;; diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index 735bcb8..1add451 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -175,7 +175,6 @@ function showDevInstallMenu () { "devbase" "dev apps and tools" \ "java11" "OpenJDK Java 11 dev env" \ "javascript" "JavaScript dev env" \ - "mongodbce" "MongoDB CE" \ "php" "PHP dev env" \ "lua" "Lua dev env" \ "ruby" "Ruby dev env" \ @@ -186,10 +185,6 @@ function showDevInstallMenu () { "brackets" "Brackets" \ "codeblocks" "CodeBlocks" \ "geany" "Geany" \ - "idea" "Idea" \ - "eclipse" "Eclipse" \ - "pycharmprofessional" "PyCharm Professional edition" \ - "pycharmcommunity" "PyCharm Community edition" \ "vsc" "Visual Studio Code" \ "androidstudio" "Android Studio" \ "sublimetext" "Sublime Text" \ @@ -211,9 +206,6 @@ function showDevInstallMenu () { "javascript") installAppsFromListMenu javascript ;; - "mongodbce") - installAppsFromListMenu mongodb - ;; "php") installAppsFromListMenu php ;; @@ -244,18 +236,6 @@ function showDevInstallMenu () { "geany") installAppsFromListMenu geany ;; - "idea") - installAppsFromListMenu idea - ;; - "eclipse") - installAppsFromListMenu eclipse - ;; - "pycharmprofessional") - installAppsFromListMenu pycharm-professional - ;; - "pycharmcommunity") - installAppsFromListMenu pycharm-community - ;; "vsc") installAppsFromListMenu code ;; diff --git a/vars.sh b/vars.sh index 7583959..7c4b75a 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b2" +version="0.6.1-b3" # # myHomedir is used in full paths to the homedir From 0d7ec9e1a7f45b4e8548a362a9876181fd7e3e28 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 10 Jul 2020 21:08:29 +0200 Subject: [PATCH 245/261] mkv repo fixed to amd64 only for 20.04 branch --- repo_functions_ub2004.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 584213a..452ecb2 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -629,8 +629,8 @@ function addRepo_Webupd8 () { function addRepo_MKVToolnix () { addKey "https://mkvtoolnix.download/gpg-pub-moritzbunkus.txt" addRepo mkv.list \ - "deb https://mkvtoolnix.download/ubuntu/ focal main" \ - "deb-src https://mkvtoolnix.download/ubuntu/ focal main" + "deb [arch=amd64] https://mkvtoolnix.download/ubuntu/ focal main" \ + "deb-src [arch=amd64] https://mkvtoolnix.download/ubuntu/ focal main" } # From e4264aa298632595edf7ddf0a15eedb6393700bb Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 26 Jul 2020 14:29:58 +0200 Subject: [PATCH 246/261] nextcloud ext re-added for both branches --- repo_functions_ub1804.sh | 20 +++++++++++++++----- repo_functions_ub2004.sh | 15 +++++++++++++-- 2 files changed, 28 insertions(+), 7 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index a981c9f..195bf64 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -139,7 +139,7 @@ org.gnome.Geary;flatpak;internet;geary birdtray;apt;internet;birdtray telegram;apt;internet;telegram skypeforlinux;apt;internet;skypeforlinux -nextcloud-client;apt;internet;nextcloud-client +nextcloud-desktop;apt;internet;nextcloud-desktop deluge-gtk;apt;internet;deluge-gtk deluge-torrent;apt;internet;deluge-torrent vivaldi-stable;apt;internet;vivaldi-stable @@ -249,7 +249,6 @@ caja-wallpaper;apt;cajaplugins;caja-wallpaper caja-sendto;apt;cajaplugins;caka-sendto caja-image-converter;apt;cajaplugins;caja-image-converter insync-caja;apt;cajaplugins;insync-caja -nextcloud-client-caja;apt;cajaplugins;nextcloud-client-caja nautilus;apt;nautilus;nautilus file-roller;apt;nautilus;file-roller nautilus-emblems;apt;nautilus;nautilus-emblems @@ -426,7 +425,7 @@ opera-stable;addRepo_Opera insync;addRepo_Insync google-chrome-stable;addRepo_ChromeStable atom;addRepo_Atom -nextcloud-client;addRepo_NextCloud +nextcloud-desktop;addRepo_NextCloud wireshark;addRepo_WireShark darktable;addRepo_DarkTable brackets;addRepo_Brackets @@ -1139,6 +1138,7 @@ nodejslts;nodejslts_PostTrtFct angularcli;angularcli_PostTrtFct dockerio;dockerio_PostTrtFct megasync;megasync_PostTrtFct +nextcloud-desktop;nextcloud_PostTrtFct flatpak;flatpak_PostTrtFct gcc8;gcc8_PostTrtFct ruby-dev;ruby-dev_PostTrtFct @@ -1220,7 +1220,6 @@ function nodejslts_PostTrtFct () { retCode $ret_code } - # # GEM / Ruby Dev # @@ -1255,7 +1254,6 @@ function flatpak_PostTrtFct () { fi } - # # MEGASync # @@ -1268,6 +1266,18 @@ function megasync_PostTrtFct () { fi } +# +# Nextcloud +# +function nextcloud_PostTrtFct () { + if which nautilus >/dev/null; then + installPackage apt nextcloud-client-nautilus + fi + if which caja >/dev/null; then + installPackage apt nextcloud-client-caja + fi +} + # # Docker # diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 452ecb2..8b13758 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -1018,6 +1018,7 @@ nodejslts;nodejslts_PostTrtFct angularcli;angularcli_PostTrtFct dockerio;dockerio_PostTrtFct megasync;megasync_PostTrtFct +nextcloud-desktop;nextcloud_PostTrtFct flatpak;flatpak_PostTrtFct ruby-dev;ruby-dev_PostTrtFct virtualbox;virtualbox_PostTrtFct @@ -1098,7 +1099,6 @@ function nodejslts_PostTrtFct () { retCode $ret_code } - # # GEM / Ruby Dev # @@ -1123,7 +1123,6 @@ function flatpak_PostTrtFct () { fi } - # # MEGASync # @@ -1136,6 +1135,18 @@ function megasync_PostTrtFct () { fi } +# +# Nextcloud +# +function nextcloud_PostTrtFct () { + if which nautilus >/dev/null; then + installPackage apt nautilus-nextcloud + fi + if which caja >/dev/null; then + installPackage apt caja-nextcloud + fi +} + # # Docker # From f49209b1eb90eb427cc8500d7c603ca96b058d01 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sun, 26 Jul 2020 14:30:16 +0200 Subject: [PATCH 247/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 7c4b75a..d2d3918 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b3" +version="0.6.1-b4" # # myHomedir is used in full paths to the homedir From e5843eed42c7800718e8713049d071668868e699 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 31 Jul 2020 17:55:04 +0200 Subject: [PATCH 248/261] xnviewmp as flatpak instead of external deb pkg --- install_functions_ub1804.sh | 18 ------------------ install_functions_ub2004.sh | 18 ------------------ menus_functions_ub1804.sh | 4 ---- menus_functions_ub2004.sh | 4 ---- repo_functions_ub1804.sh | 1 + repo_functions_ub2004.sh | 1 + vars.sh | 2 +- yggdrasil.sh | 2 -- 8 files changed, 3 insertions(+), 47 deletions(-) diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 6a0327d..7f39e81 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -52,24 +52,6 @@ function installSlackMenu () { yes } -# -# XnViewMP (headless) -# -function installXnViewMP () { - installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ - xnviewmp.deb \ - no -} - -# -# XnViewMP (Menu) -# -function installXnViewMPMenu () { - installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ - xnviewmp.deb \ - yes -} - # # update AMD/Intel CPU Microcode # diff --git a/install_functions_ub2004.sh b/install_functions_ub2004.sh index d2b658b..b14dc62 100644 --- a/install_functions_ub2004.sh +++ b/install_functions_ub2004.sh @@ -52,24 +52,6 @@ function installSlackMenu () { yes } -# -# XnViewMP (headless) -# -function installXnViewMP () { - installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ - xnviewmp.deb \ - no -} - -# -# XnViewMP (Menu) -# -function installXnViewMPMenu () { - installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ - xnviewmp.deb \ - yes -} - # # update AMD/Intel CPU Microcode # diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index c828e5a..095e03c 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -307,7 +307,6 @@ function showAppInstallMenu () { "viber" "Viber IM desktop app" \ "slack" "Slack App" \ "appimagelauncher" "AppImage Launcher" \ - "xnviewmp" "XNView MP" \ "Back" "Back" 3>&1 1>&2 2>&3) case $appsInstallMenuOptions in @@ -377,9 +376,6 @@ function showAppInstallMenu () { "appimagelauncher") installAppImageLauncherMenu ;; - "xnviewmp") - installXnViewMPMenu - ;; "Back") break ;; diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index 1add451..6edf48d 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -303,7 +303,6 @@ function showAppInstallMenu () { "viber" "Viber IM desktop app" \ "slack" "Slack App" \ "appimagelauncher" "AppImage Launcher" \ - "xnviewmp" "XNView MP" \ "Back" "Back" 3>&1 1>&2 2>&3) case $appsInstallMenuOptions in @@ -373,9 +372,6 @@ function showAppInstallMenu () { "appimagelauncher") installAppImageLauncherMenu ;; - "xnviewmp") - installXnViewMPMenu - ;; "Back") break ;; diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 195bf64..bf77619 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -120,6 +120,7 @@ peek;apt;multimedia;peek bino;apt;multimedia;bino kdenlive;apt;multimedia;kdenlive com.github.huluti.ImCompressor;flatpak;multimedia;ImCompressor +com.xnview.XnViewMP;flatpak;multimedia;xnviewmp syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 8b13758..bf97213 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -108,6 +108,7 @@ flacon;apt;multimedia;flacon simplescreenrecorder;apt;multimedia;simplescreenrecorder com.ozmartians.VidCutter;flatpak;multimedia;vidcutter com.orama_interactive.Pixelorama;flatpak;multimedia;pixelorama +com.xnview.XnViewMP;flatpak;multimedia;xnviewmp syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync diff --git a/vars.sh b/vars.sh index d2d3918..ecf2739 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b4" +version="0.6.1-b5" # # myHomedir is used in full paths to the homedir diff --git a/yggdrasil.sh b/yggdrasil.sh index a56e6fa..4848357 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -105,7 +105,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do installViber installBoostnotes installTeamViewer13 - installXnViewMP installAppImageLauncher ;; f) # full install @@ -149,7 +148,6 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do installViber installBoostnotes installTeamViewer13 - installXnViewMP installAppImageLauncher ;; c) # install themes and icons From 8e2fbd6a98d1355335991e58c9016f29efc02d60 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 31 Jul 2020 18:44:38 +0200 Subject: [PATCH 249/261] revert back to deb pkg for xnviewmp --- install_functions_ub1804.sh | 18 ++++++++++++++++++ install_functions_ub2004.sh | 18 ++++++++++++++++++ menus_functions_ub1804.sh | 4 ++++ menus_functions_ub2004.sh | 4 ++++ repo_functions_ub1804.sh | 1 - repo_functions_ub2004.sh | 1 - vars.sh | 2 +- yggdrasil.sh | 2 ++ 8 files changed, 47 insertions(+), 3 deletions(-) diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh index 7f39e81..6a0327d 100644 --- a/install_functions_ub1804.sh +++ b/install_functions_ub1804.sh @@ -52,6 +52,24 @@ function installSlackMenu () { yes } +# +# XnViewMP (headless) +# +function installXnViewMP () { + installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ + xnviewmp.deb \ + no +} + +# +# XnViewMP (Menu) +# +function installXnViewMPMenu () { + installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ + xnviewmp.deb \ + yes +} + # # update AMD/Intel CPU Microcode # diff --git a/install_functions_ub2004.sh b/install_functions_ub2004.sh index b14dc62..d2b658b 100644 --- a/install_functions_ub2004.sh +++ b/install_functions_ub2004.sh @@ -52,6 +52,24 @@ function installSlackMenu () { yes } +# +# XnViewMP (headless) +# +function installXnViewMP () { + installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ + xnviewmp.deb \ + no +} + +# +# XnViewMP (Menu) +# +function installXnViewMPMenu () { + installPackageDpkg https://download.xnview.com/XnViewMP-linux-x64.deb \ + xnviewmp.deb \ + yes +} + # # update AMD/Intel CPU Microcode # diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh index 095e03c..c828e5a 100644 --- a/menus_functions_ub1804.sh +++ b/menus_functions_ub1804.sh @@ -307,6 +307,7 @@ function showAppInstallMenu () { "viber" "Viber IM desktop app" \ "slack" "Slack App" \ "appimagelauncher" "AppImage Launcher" \ + "xnviewmp" "XNView MP" \ "Back" "Back" 3>&1 1>&2 2>&3) case $appsInstallMenuOptions in @@ -376,6 +377,9 @@ function showAppInstallMenu () { "appimagelauncher") installAppImageLauncherMenu ;; + "xnviewmp") + installXnViewMPMenu + ;; "Back") break ;; diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index 6edf48d..1add451 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -303,6 +303,7 @@ function showAppInstallMenu () { "viber" "Viber IM desktop app" \ "slack" "Slack App" \ "appimagelauncher" "AppImage Launcher" \ + "xnviewmp" "XNView MP" \ "Back" "Back" 3>&1 1>&2 2>&3) case $appsInstallMenuOptions in @@ -372,6 +373,9 @@ function showAppInstallMenu () { "appimagelauncher") installAppImageLauncherMenu ;; + "xnviewmp") + installXnViewMPMenu + ;; "Back") break ;; diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index bf77619..195bf64 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -120,7 +120,6 @@ peek;apt;multimedia;peek bino;apt;multimedia;bino kdenlive;apt;multimedia;kdenlive com.github.huluti.ImCompressor;flatpak;multimedia;ImCompressor -com.xnview.XnViewMP;flatpak;multimedia;xnviewmp syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index bf97213..8b13758 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -108,7 +108,6 @@ flacon;apt;multimedia;flacon simplescreenrecorder;apt;multimedia;simplescreenrecorder com.ozmartians.VidCutter;flatpak;multimedia;vidcutter com.orama_interactive.Pixelorama;flatpak;multimedia;pixelorama -com.xnview.XnViewMP;flatpak;multimedia;xnviewmp syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync diff --git a/vars.sh b/vars.sh index ecf2739..952ea28 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b5" +version="0.6.1-b6" # # myHomedir is used in full paths to the homedir diff --git a/yggdrasil.sh b/yggdrasil.sh index 4848357..db37f1f 100755 --- a/yggdrasil.sh +++ b/yggdrasil.sh @@ -106,6 +106,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do installBoostnotes installTeamViewer13 installAppImageLauncher + installXnViewMP ;; f) # full install if [ $ygginitCount = false ]; then @@ -149,6 +150,7 @@ while getopts ":h,v,f,c,u,a,d,q,s,t,w,g,j,k,p" option; do installBoostnotes installTeamViewer13 installAppImageLauncher + installXnViewMP ;; c) # install themes and icons if [ $ygginitCount = false ]; then From 388ba73a24938f8f98cab1ac8c35133e6b94ff21 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Mon, 10 Aug 2020 15:24:00 +0200 Subject: [PATCH 250/261] LibreOffice Fresh PPA added to both branches --- repo_functions_ub1804.sh | 8 ++++---- repo_functions_ub2004.sh | 10 +++++++++- vars.sh | 2 +- 3 files changed, 14 insertions(+), 6 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 195bf64..7c37e34 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -380,7 +380,7 @@ flake8;pip;atom;flake8 autopep8;pip;atom;autopep8 htmlbeautifier;gem;atom;htmlbeautifier nitrogen;apt;nitrogen;nitrogen -libreoffice;apt;office;libreoffice6 +libreoffice;apt;office;libreoffice winehq-stable;apt;wine;winehq-stable winetricks;apt;wine;winetricks playonlinux;apt;wine;playonlinux @@ -410,7 +410,7 @@ linux-generic-hwe-18.04;apt;hwe;linux-generic-hwe-18.04" # AppsRepo="kodi-beta;addRepo_KodiBeta kodi-nightly;addRepo_KodiNightly -libreoffice6;addRepo_Libreoffice6 +libreoffice;addRepo_Libreoffice mongodb;addRepo_MongoDB_CE gyazo;addRepo_Gyazo code;addRepo_VSCode @@ -1045,9 +1045,9 @@ function addRepo_MongoDB_CE () { } # -# LibreOffice 6 +# LibreOffice # -function addRepo_Libreoffice6 () { +function addRepo_Libreoffice () { addPPA ppa:libreoffice/ppa } diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 8b13758..6ecc104 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -352,7 +352,7 @@ flake8;pip;atom;flake8 autopep8;pip;atom;autopep8 htmlbeautifier;gem;atom;htmlbeautifier nitrogen;apt;nitrogen;nitrogen -libreoffice;apt;office;libreoffice6 +libreoffice;apt;office;libreoffice winehq-stable;apt;wine;winehq-stable winetricks;apt;wine;winetricks playonlinux;apt;wine;playonlinux @@ -381,6 +381,7 @@ linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04" # fields : unique ID, function to add repo # AppsRepo="code;addRepo_VSCode +libreoffice;addRepo_Libreoffice androidstudio;addRepo_AndroidStudio sublime-text;addRepo_SublimeText vivaldi-stable;addRepo_Vivaldi @@ -934,6 +935,13 @@ function addRepo_Gyazo () { # "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" # } +# +# LibreOffice +# +function addRepo_Libreoffice () { + addPPA ppa:libreoffice/ppa +} + # # Visual Studio Code # diff --git a/vars.sh b/vars.sh index 952ea28..68af852 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b6" +version="0.6.1-b7" # # myHomedir is used in full paths to the homedir From 562bc36bdf6031b32b108bdd16248c7ea04702ad Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 12 Aug 2020 21:12:56 +0200 Subject: [PATCH 251/261] chromium beta (+codecs) PPA added for U20.04/LM20 branch --- repo_functions_ub1804.sh | 2 +- repo_functions_ub2004.sh | 33 ++++++++++++++++++++++++++++++--- vars.sh | 2 +- 3 files changed, 32 insertions(+), 5 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 7c37e34..cbec293 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -1204,7 +1204,7 @@ function nodejslts_PostTrtFct () { retCode $ret_code if [ `grep 'PATH=~/.local/bin/:$PATH' ~/.bashrc | wc -l` -gt 0 ]; then - printf "[NPM] add ~/.local/bin to PATH ... already added [ "$BOLDVERT"OK"$NORMAL" ]\n " + printf "[NPM] add ~/.local/bin to PATH ... already added [ "$BOLDVERT"OK"$NORMAL" ]\n" else printf "[NPM] add ~/.local/bin to PATH " printf "\n[NPM] add ~/.local/bin to PATH\n" &>> $logFile diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index 6ecc104..ce593a6 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -118,6 +118,7 @@ com.teamspeak.TeamSpeak;flatpak;internet;TeamSpeak quiterss;apt;internet;quiterss opera-stable;apt;internet;opera-stable google-chrome-stable;apt;internet;google-chrome-stable +chromium-browser;apt;internet;chromium-browser filezilla;apt;internet;filezilla hexchat;apt;internet;hexchat mumble;apt;internet;mumble @@ -461,7 +462,8 @@ kodi;addRepo_Kodi avidemux;addRepo_Avidemux winehq-stable;addRepo_WineHQ audacity;addRepo_Audacity -ubuntu-make;addRepo_UbuntuMake" +ubuntu-make;addRepo_UbuntuMake +chromium-browser;addRepo_ChromiumBrowser" #TODO : no focal support yet / or not needed yet #rawtherapee;addRepo_DhorMyWay @@ -482,6 +484,13 @@ ubuntu-make;addRepo_UbuntuMake" #mongodb;addRepo_MongoDB_CE #flatpak;addRepo_flatpak +# +# Chromium Browser BETA (to avoid SNAP version) +# +function addRepo_ChromiumBrowser () { + addPPA ppa:saiarcot895/chromium-beta +} + # # Audacity # @@ -969,7 +978,25 @@ function addRepo_AndroidStudio () { AppsPreTrtFct="opera-stable;opera_PreTrtFct steam;steam_PreTrtFct wireshark;wireshark_PreTrtFct -snapd;snapd_PreTrtFct" +snapd;snapd_PreTrtFct +chromium-browser;chromium_PreTrtFct" + +# +# Chromium BETA PPA Pinning +# +function chromium_PreTrtFct () { + if [ ! -f /etc/apt/preferences.d/saiarcot895-chromium-beta.pref ]; then + printf "[CMD] APT Pinning Chromium BETA PPA " + printf "[CMD] APT Pinning Chromium BETA PPA\n" &>> $logFile + topin='# Ensure packages from saiarcot895-chromium-beta PPA have priority\n' + topin+='Package: *\n' + topin+='Pin: release o=LP-PPA-saiarcot895-chromium-beta\n' + topin+='Pin-Priority: 800\n' + echo -e $topin | sudo tee /etc/apt/preferences.d/saiarcot895-chromium-beta.pref &>> $logFile + ret_code=$? + retCode $ret_code + fi +} # # Snap @@ -1091,7 +1118,7 @@ function nodejslts_PostTrtFct () { retCode $ret_code if [ `grep 'PATH=~/.local/bin/:$PATH' ~/.bashrc | wc -l` -gt 0 ]; then - printf "[NPM] add ~/.local/bin to PATH ... already added [ "$BOLDVERT"OK"$NORMAL" ]\n " + printf "[NPM] add ~/.local/bin to PATH ... already added [ "$BOLDVERT"OK"$NORMAL" ]\n" else printf "[NPM] add ~/.local/bin to PATH " printf "\n[NPM] add ~/.local/bin to PATH\n" &>> $logFile diff --git a/vars.sh b/vars.sh index 68af852..78453f6 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b7" +version="0.6.1-b15" # # myHomedir is used in full paths to the homedir From 49fb951fee8bfd9be17a40e240fa73ee6b69a048 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Wed, 12 Aug 2020 21:13:20 +0200 Subject: [PATCH 252/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index 78453f6..cd920b6 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b15" +version="0.6.1-b16" # # myHomedir is used in full paths to the homedir From 7383ac3028c7b5486b8b1a8a9992429c5255f4ad Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Thu, 13 Aug 2020 20:17:38 +0200 Subject: [PATCH 253/261] Flatseal added --- repo_functions_ub1804.sh | 1 + repo_functions_ub2004.sh | 1 + 2 files changed, 2 insertions(+) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index cbec293..34b6271 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -199,6 +199,7 @@ balena-etcher-electron;apt;utilities;balena-etcher-electron org.gabmus.hydrapaper;flatpak;utilities;hydrapaper nvme-cli;apt;utilities;nvme-cli font-manager;apt;utilities;font-manager +com.github.tchx84.Flatseal;flatpak;utilities;flatseal python3-dev;apt;python;python3-dev python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index ce593a6..c0b615a 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -181,6 +181,7 @@ nvme-cli;apt;utilities;nvme-cli font-manager;apt;utilities;font-manager gyazo;apt;utilities;gyazo inxi;apt;utilities;inxi +com.github.tchx84.Flatseal;flatpak;utilities;flatseal python3-dev;apt;python;python3-dev python3-pyqt5;apt;python;python3-pyqt5 pyqt5-dev-tools;apt;python;pyqt5-dev-tools From 3b916d075c3424881d66ce6de5a2dfdcb95a3318 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Thu, 13 Aug 2020 20:43:52 +0200 Subject: [PATCH 254/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index cd920b6..a7fe646 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b16" +version="0.6.1-b17" # # myHomedir is used in full paths to the homedir From 4289c6494af454f34cd6ba434b70c22e9d4c383d Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Thu, 13 Aug 2020 20:51:01 +0200 Subject: [PATCH 255/261] geary flatpak -> apt --- repo_functions_ub1804.sh | 2 +- repo_functions_ub2004.sh | 2 +- vars.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh index 34b6271..820d86b 100644 --- a/repo_functions_ub1804.sh +++ b/repo_functions_ub1804.sh @@ -135,7 +135,7 @@ chromium-browser-l10n;apt;internet;chromium-browser-l10n filezilla;apt;internet;filezilla hexchat;apt;internet;hexchat mumble;apt;internet;mumble -org.gnome.Geary;flatpak;internet;geary +geary;apt;internet;geary birdtray;apt;internet;birdtray telegram;apt;internet;telegram skypeforlinux;apt;internet;skypeforlinux diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index c0b615a..bb9ec70 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -122,7 +122,7 @@ chromium-browser;apt;internet;chromium-browser filezilla;apt;internet;filezilla hexchat;apt;internet;hexchat mumble;apt;internet;mumble -org.gnome.Geary;flatpak;internet;geary +geary;apt;internet;geary birdtray;apt;internet;birdtray telegram;apt;internet;telegram skypeforlinux;apt;internet;skypeforlinux diff --git a/vars.sh b/vars.sh index a7fe646..afb7212 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b17" +version="0.6.1-b18" # # myHomedir is used in full paths to the homedir From 30a49c66219d2e207289a9db59f8162b1580f9d4 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 5 Sep 2020 15:55:40 +0200 Subject: [PATCH 256/261] vbox (ubuntu repo) -> vbox (oracle repo) --- repo_functions_ub2004.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index bb9ec70..cbeff68 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -298,7 +298,7 @@ cheese;apt;webcam;cheese tlp;apt;tlp;tlp notepadqq;apt;dev;notepadqq gpick;apt;dev;gpick -virtualbox;apt;dev;virtualbox +virtualbox-6.1;apt;dev;virtualbox build-essential;apt;dev;build-essential ghex;apt;dev;ghex glade;apt;dev;glade From 2fab391ebdb6b196ce5401a843cca0464045e1b3 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 5 Sep 2020 15:56:12 +0200 Subject: [PATCH 257/261] ver upd --- vars.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vars.sh b/vars.sh index afb7212..40a76a7 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b18" +version="0.6.1-b19" # # myHomedir is used in full paths to the homedir From 2ba1d57714a4a29658391d9ccebacb83489ff6bf Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 31 Oct 2020 23:03:09 +0100 Subject: [PATCH 258/261] MongoDB CE 4 + vainfo added (20.04 branch) --- menus_functions_ub2004.sh | 4 ++++ repo_functions_ub2004.sh | 20 +++++++++++--------- vars.sh | 2 +- 3 files changed, 16 insertions(+), 10 deletions(-) diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh index 1add451..acb6e78 100644 --- a/menus_functions_ub2004.sh +++ b/menus_functions_ub2004.sh @@ -175,6 +175,7 @@ function showDevInstallMenu () { "devbase" "dev apps and tools" \ "java11" "OpenJDK Java 11 dev env" \ "javascript" "JavaScript dev env" \ + "mongodb" "MongoDB CE 4" \ "php" "PHP dev env" \ "lua" "Lua dev env" \ "ruby" "Ruby dev env" \ @@ -206,6 +207,9 @@ function showDevInstallMenu () { "javascript") installAppsFromListMenu javascript ;; + "mongodb") + installAppsFromListMenu mongodb + ;; "php") installAppsFromListMenu php ;; diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh index cbeff68..11c1b97 100644 --- a/repo_functions_ub2004.sh +++ b/repo_functions_ub2004.sh @@ -108,6 +108,7 @@ flacon;apt;multimedia;flacon simplescreenrecorder;apt;multimedia;simplescreenrecorder com.ozmartians.VidCutter;flatpak;multimedia;vidcutter com.orama_interactive.Pixelorama;flatpak;multimedia;pixelorama +vainfo;apt;multimedia;vainfo syncthing;apt;internet;syncthing syncthing-gtk;apt;internet;syncthinggtk insync;apt;internet;insync @@ -328,6 +329,7 @@ ionic;npm;javascript;ionic cordova;npm;javascript;cordova eslint;npm;javascript;eslint web-ext;npm;javascript;web-ext +mongodb-org;apt;mongodb;mongodb openjdk-11-jdk;apt;java11;openjdk-11-jdk php7.4-cli;apt;php;php7.4-cli php-pear;apt;php;php-pear @@ -372,7 +374,7 @@ linux-generic-hwe-20.04;apt;hwe;linux-generic-hwe-20.04" #TODO : no focal support yet #aptik;apt;utilities;aptik #green-recorder;apt;multimedia;green-recorder -#mongodb-org;apt;mongodb;mongodb + #-----------------------------------------------------------------------------# # Specific Repo list and functions # @@ -464,7 +466,8 @@ avidemux;addRepo_Avidemux winehq-stable;addRepo_WineHQ audacity;addRepo_Audacity ubuntu-make;addRepo_UbuntuMake -chromium-browser;addRepo_ChromiumBrowser" +chromium-browser;addRepo_ChromiumBrowser +mongodb;addRepo_MongoDB_CE" #TODO : no focal support yet / or not needed yet #rawtherapee;addRepo_DhorMyWay @@ -482,7 +485,6 @@ chromium-browser;addRepo_ChromiumBrowser" #syncthinggtk;addRepo_SyncthingGtk #wireshark;addRepo_WireShark #green-recorder;addRepo_GreenRecorder -#mongodb;addRepo_MongoDB_CE #flatpak;addRepo_flatpak # @@ -937,13 +939,13 @@ function addRepo_Gyazo () { } # -# MongoDB 4 CE #TODO : no focal support yet +# MongoDB 4 CE # -# function addRepo_MongoDB_CE () { -# addKey "https://www.mongodb.org/static/pgp/server-4.2.asc" -# addRepo "mongodb-org-4.2.list" \ -# "deb [ arch=amd64 ] https://repo.mongodb.org/apt/ubuntu bionic/mongodb-org/4.2 multiverse" -# } +function addRepo_MongoDB_CE () { + addKey "https://www.mongodb.org/static/pgp/server-4.4.asc" + addRepo "mongodb-org-4.4.list" \ + "deb [ arch=amd64,arm64 ] https://repo.mongodb.org/apt/ubuntu focal/mongodb-org/4.4 multiverse" +} # # LibreOffice diff --git a/vars.sh b/vars.sh index 40a76a7..b95097d 100644 --- a/vars.sh +++ b/vars.sh @@ -13,7 +13,7 @@ # # app version number # -version="0.6.1-b19" +version="0.6.1-b21" # # myHomedir is used in full paths to the homedir From baee8447f2418c8cc8b24d0149027738e334a332 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Sat, 31 Oct 2020 23:08:36 +0100 Subject: [PATCH 259/261] 16.04 branch remove, 18.04 frozen, 20.04 is the way to go ;) --- README.md | 25 ++++++++----------------- 1 file changed, 8 insertions(+), 17 deletions(-) diff --git a/README.md b/README.md index 3612bd2..4db5ae6 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ The purpose of this script is to provide a tool to install, customize and tweak Installation ------------ -Linux Mint 20 / Ubuntu 20.04 (Yggdrasil >= 0.5.1) +Linux Mint 20 / Ubuntu 20.04 (Yggdrasil >= 0.6.1-b21) ```shell curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - @@ -17,27 +17,18 @@ sudo apt-get update sudo apt-get install yggdrasil ``` -Linux Mint 19 / Ubuntu 18.04 (Yggdrasil >= 0.5.1) +Linux Mint 19 / Ubuntu 18.04 (Yggdrasil <= 0.6.1-b19) + +>* As Linux Mint 20 is released for a while already, this version of Yggdrasil is End of Life and thus is frozen as it. +>* No bugs fixed, features or any changes will be made on this branch anymore. +>* If you still need it, use it at your own risk and without guarantee third parties repositories are still available +>* The latest version of Yggdrasil for this branch is : 0.6.1-b19 ```shell curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - echo "deb https://packagecloud.io/makoto/stable/ubuntu/ bionic main" | sudo tee /etc/apt/sources.list.d/makoto.list sudo apt-get update -sudo apt-get install yggdrasil -``` - -Linux Mint 18 / Ubuntu 16.04 (Yggdrasil < 0.5.1) - ->* This version is rather old and using deprecated version of Linux Mint / Ubuntu. ->* No bugs fixed, features or any changes will be made on this branch anymore. ->* If you still need it, use it at your own risk and without guarantee third parties repositories are still available ->* The latest version of Yggdrasil for this branch is : 0.5.0-b23 - -```shell -curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - -echo "deb https://packagecloud.io/makoto/stable/ubuntu/ xenial main" | sudo tee /etc/apt/sources.list.d/makoto.list -sudo apt-get update -sudo apt-get install yggdrasil=0.5.0-b23 +sudo apt-get install yggdrasil=0.6.1-b19 ``` Credits From e8953e0fe3a1062e961eb25226ce013f03fc27cf Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Fri, 18 Dec 2020 21:30:46 +0100 Subject: [PATCH 260/261] . --- .gitignore | 0 .whitesource | 0 LICENSE | 0 README.md | 0 core_functions.sh | 0 install_functions_ub1804.sh | 0 install_functions_ub2004.sh | 0 logo.png | Bin menus_functions_ub1804.sh | 0 menus_functions_ub2004.sh | 0 notify.mp3 | Bin repo_functions_ub1804.sh | 0 repo_functions_ub2004.sh | 0 tools_functions.sh | 0 vars.sh | 0 15 files changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 .gitignore mode change 100644 => 100755 .whitesource mode change 100644 => 100755 LICENSE mode change 100644 => 100755 README.md mode change 100644 => 100755 core_functions.sh mode change 100644 => 100755 install_functions_ub1804.sh mode change 100644 => 100755 install_functions_ub2004.sh mode change 100644 => 100755 logo.png mode change 100644 => 100755 menus_functions_ub1804.sh mode change 100644 => 100755 menus_functions_ub2004.sh mode change 100644 => 100755 notify.mp3 mode change 100644 => 100755 repo_functions_ub1804.sh mode change 100644 => 100755 repo_functions_ub2004.sh mode change 100644 => 100755 tools_functions.sh mode change 100644 => 100755 vars.sh diff --git a/.gitignore b/.gitignore old mode 100644 new mode 100755 diff --git a/.whitesource b/.whitesource old mode 100644 new mode 100755 diff --git a/LICENSE b/LICENSE old mode 100644 new mode 100755 diff --git a/README.md b/README.md old mode 100644 new mode 100755 diff --git a/core_functions.sh b/core_functions.sh old mode 100644 new mode 100755 diff --git a/install_functions_ub1804.sh b/install_functions_ub1804.sh old mode 100644 new mode 100755 diff --git a/install_functions_ub2004.sh b/install_functions_ub2004.sh old mode 100644 new mode 100755 diff --git a/logo.png b/logo.png old mode 100644 new mode 100755 diff --git a/menus_functions_ub1804.sh b/menus_functions_ub1804.sh old mode 100644 new mode 100755 diff --git a/menus_functions_ub2004.sh b/menus_functions_ub2004.sh old mode 100644 new mode 100755 diff --git a/notify.mp3 b/notify.mp3 old mode 100644 new mode 100755 diff --git a/repo_functions_ub1804.sh b/repo_functions_ub1804.sh old mode 100644 new mode 100755 diff --git a/repo_functions_ub2004.sh b/repo_functions_ub2004.sh old mode 100644 new mode 100755 diff --git a/tools_functions.sh b/tools_functions.sh old mode 100644 new mode 100755 diff --git a/vars.sh b/vars.sh old mode 100644 new mode 100755 From 8b52f40ed68b29b419606ef88915a8f671b88ef4 Mon Sep 17 00:00:00 2001 From: "Francois B. (Makoto)" Date: Tue, 5 Nov 2024 01:25:57 +0100 Subject: [PATCH 261/261] . --- README.md | 35 ++++++++++++++++------------------- 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 4db5ae6..7a0adb3 100755 --- a/README.md +++ b/README.md @@ -1,14 +1,14 @@ +# Yggdrasil-NG + ![yggdrasil](logo.png) -About ------ +> **Notice** : this script is no longer maintain ! The purpose of this script is to provide a tool to install, customize and tweak a fresh installation of Linux Mint / Ubuntu. -Installation ------------- +## Installation -Linux Mint 20 / Ubuntu 20.04 (Yggdrasil >= 0.6.1-b21) +### Linux Mint 20 / Ubuntu 20.04 (Yggdrasil >= 0.6.1-b21) ```shell curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - @@ -17,12 +17,12 @@ sudo apt-get update sudo apt-get install yggdrasil ``` -Linux Mint 19 / Ubuntu 18.04 (Yggdrasil <= 0.6.1-b19) +### Linux Mint 19 / Ubuntu 18.04 (Yggdrasil <= 0.6.1-b19) ->* As Linux Mint 20 is released for a while already, this version of Yggdrasil is End of Life and thus is frozen as it. ->* No bugs fixed, features or any changes will be made on this branch anymore. ->* If you still need it, use it at your own risk and without guarantee third parties repositories are still available ->* The latest version of Yggdrasil for this branch is : 0.6.1-b19 +> - As Linux Mint 20 is released for a while already, this version of Yggdrasil is End of Life and thus is frozen as it. +> - No bugs fixed, features or any changes will be made on this branch anymore. +> - If you still need it, use it at your own risk and without guarantee third parties repositories are still available +> - The latest version of Yggdrasil for this branch is : 0.6.1-b19 ```shell curl -L https://packagecloud.io/makoto/stable/gpgkey | sudo apt-key add - @@ -31,15 +31,12 @@ sudo apt-get update sudo apt-get install yggdrasil=0.6.1-b19 ``` -Credits -------- +## Credits -This script has been written by Francois B. (Makotosan) +- Author : Francois B. (Makoto) +- Email : +- Website : -* Email : francois@makotonoblog.be -* Website : https://makotonoblog.be/yggdrasil/ +## Licence -Licence -------- - -The script is licensed under the terms of the GPLv3 +The script is licensed under the terms of the GPL-3.0