Crash_Override/FreeDATA
1
0
Fork 0
mirror of https://github.com/DJ2LS/FreeDATA synced 2024-05-14 08:04:33 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse source
This commit is contained in:
DJ2LS 2024-05-01 10:12:59 +02:00
commit 84899c9589
2 changed files with 50 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

36
tools/Linux/install-freedata-linux.sh
View file

@ -3,7 +3,7 @@
# Simple script to install FreeDATA in Linux # Simple script to install FreeDATA in Linux
# Dj Merrill - 25 Apr 2024 # Dj Merrill - 25 Apr 2024
# #
# Currently supports Debian 12, Ubuntu 24.04 LTS # Currently supports Debian [11,12], Ubuntu [24.04]
# #
# args: nothing or "main" (use main branch of FreeDATA) # args: nothing or "main" (use main branch of FreeDATA)
# "develop" (use develop branch of FreeDATA) # "develop" (use develop branch of FreeDATA)
@ -34,8 +34,8 @@ echo "*************************************************************************"
case $osname in case $osname in
"Debian GNU/Linux") "Debian GNU/Linux")
case $osversion in case $osversion in
"12 (bookworm)") "11 (bullseye)" | "12 (bookworm)")
sudo apt install --upgrade -y libhamlib-utils libhamlib-dev libhamlib4 fonts-noto-color-emoji git build-essential cmake npm nodejs python3 portaudio19-dev python3-pyaudio python3-pip python3-colorama sudo apt install --upgrade -y libhamlib-utils libhamlib-dev libhamlib4 fonts-noto-color-emoji git build-essential cmake python3 portaudio19-dev python3-pyaudio python3-pip python3-colorama python3-venv wget
;; ;;
*) *)
@ -53,7 +53,7 @@ case $osname in
"Ubuntu") "Ubuntu")
case $osversion in case $osversion in
"24.04 LTS (Noble Numbat)") "24.04 LTS (Noble Numbat)")
sudo apt install --upgrade -y libhamlib-utils libhamlib-dev libhamlib4 fonts-noto-color-emoji git build-essential cmake npm nodejs python3 portaudio19-dev python3-pyaudio python3-pip python3-colorama python3-venv sudo apt install --upgrade -y libhamlib-utils libhamlib-dev libhamlib4 fonts-noto-color-emoji git build-essential cmake python3 portaudio19-dev python3-pyaudio python3-pip python3-colorama python3-venv curl wget
;; ;;
*) *)
@ -75,6 +75,34 @@ case $osname in
;; ;;
esac esac
echo "*************************************************************************"
echo "Installing nvm and node v 20 into ~/.nvm"
echo "*************************************************************************"
wget https://raw.githubusercontent.com/nvm-sh/nvm/v0.39.7/install.sh
if [ -f "install.sh" ];
then
XDG_CONFIG_HOME=""
chmod 750 install.sh
./install.sh
else
echo "Something went wrong. npm install.sh not downloaded."
exit 1
fi
if [ -f "$HOME/.nvm/bash_completion" ];
then
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
nvm install 20
echo "nvm is version" `npm -v`
echo "node is version" `node -v`
rm install.sh
else
echo "Something went wrong. $HOME/.nvm environment not created properly."
exit 1
fi
echo "*************************************************************************" echo "*************************************************************************"
echo "Checking for old FreeDATA directories" echo "Checking for old FreeDATA directories"
echo "*************************************************************************" echo "*************************************************************************"

18
tools/Linux/run-freedata-linux.sh
View file

@ -74,6 +74,24 @@ else
fi fi
cd $guidir cd $guidir
if [ -f "$HOME/.nvm/bash_completion" ];
then
export NVM_DIR="$HOME/.nvm"
[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"
else
echo "Something went wrong. $HOME/.nvm environment not created properly."
exit 1
fi
checknpm=`which npm`
if [ -z "$checknpm" ];
then
echo "Something went wrong. npm not found."
exit 1
fi
npm start > ../../FreeDATA-client.log 2>&1 npm start > ../../FreeDATA-client.log 2>&1
# If we are this far, then we have just quit the GUI, so let's clean up the # If we are this far, then we have just quit the GUI, so let's clean up the