diff --git a/main/setup.sh b/main/setup.sh index f78d664..a4e3474 100644 --- a/main/setup.sh +++ b/main/setup.sh @@ -7,6 +7,7 @@ MAKEMKV_VERSION=1.18.2 JF_VERSION=1.12.0 LINUX_VERSION=trixie PROTON_VERSION=2.14.0 +KRITA_VERSION=5.2.13 echo " " echo "INFO ! checking for & installing updates." @@ -68,10 +69,10 @@ echo " " echo " " echo "INFO ! Rubyripper utillities." echo " " -#apt-get install --no-install-recommends -y ruby ruby-rexml ruby-gettext ruby-gtk3 -#apt-get install --no-install-recommends -y cdparanoia cd-discid eject normalize-audio sox cdrdao -#apt-get install --no-install-recommends -y vorbisgain mp3gain -#apt-get install --no-install-recommends -y flac lame +# apt-get install --no-install-recommends -y ruby ruby-rexml ruby-gettext ruby-gtk3 +# apt-get install --no-install-recommends -y cdparanoia cd-discid eject normalize-audio sox cdrdao +# apt-get install --no-install-recommends -y vorbisgain mp3gain +# apt-get install --no-install-recommends -y flac lame echo " " echo "INFO ! Codeing things." @@ -97,9 +98,9 @@ fi echo " " echo "INFO ! Media things." echo " " -apt-get install --no-install-recommends -y audacity +# apt-get install --no-install-recommends -y audacity apt-get install --no-install-recommends -y vlc -apt-get install --no-install-recommends -y obs-studio +# apt-get install --no-install-recommends -y obs-studio # apt-get install --no-install-recommends -y kdenlive apt-get install --no-install-recommends -y gimp # apt-get install --no-install-recommends -y inkscape @@ -116,6 +117,16 @@ apt-get install --no-install-recommends -y gimp # rm -fr jellyfin-media-player_${JF_VERSION}-${LINUX_VERSION}.deb # fi +# if [ -e /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage ] +# then +# echo "INFO ! krita-${KRITA_VERSION}-x86_64.AppImage installed ... moving on." +# else +# echo " " +# echo "WARNING ! krita-${KRITA_VERSION}-x86_64.AppImage not installed ... will install now." +# wget --no-cache --show-progress --progress=bar:force:noscroll "https://download.kde.org/stable/krita/${KRITA_VERSION}/krita-${KRITA_VERSION}-x86_64.AppImage" -O /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage +# chown ${USER} /home/${USER}/krita-${KRITA_VERSION}-x86_64.AppImage +# fi + echo " " echo "INFO ! Moddeling/3D Printing stuff." echo " " @@ -170,8 +181,9 @@ echo " " #flatpak install flathub io.github.jeffshee.Hidamari echo " " -echo "INFO ! Installing Microsoft Java" +echo "INFO ! Java" echo " " +## Microsoft # if dpkg -s msopenjdk-21 &> /dev/null # then # echo "INFO ! msopenjdk-21 installed ... moving on." @@ -187,6 +199,26 @@ echo " " # apt-get install --no-install-recommends -y msopenjdk-21 # fi +## Open JDK +if dpkg -s openjdk-21-jdk-headless &> /dev/null + then + echo "INFO ! openjdk-21-jdk-headless installed ... moving on." + else + echo " " + echo "WARNING ! openjdk-21-jdk-headless not installed ... will install now." + apt-get install --no-install-recommends -y openjdk-21-jdk-headless +fi + +## Open JRE +if dpkg -s openjdk-21-jre-headless &> /dev/null + then + echo "INFO ! openjdk-21-jre-headless installed ... moving on." + else + echo " " + echo "WARNING ! openjdk-21-jre-headless not installed ... will install now." + apt-get install --no-install-recommends -y openjdk-21-jre-headless +fi + echo " " echo "INFO ! Installing Wine/Winetricks" echo " "