mirror of https://github.com/DJ2LS/FreeDATA.git
Reflect directory name changes in prep for merging develop to main
parent
ee295cfe18
commit
4e6fa5e100
|
@ -19,9 +19,13 @@
|
||||||
#
|
#
|
||||||
#
|
#
|
||||||
# Changelog:
|
# Changelog:
|
||||||
|
# 1.6: 22 May 2024
|
||||||
|
# Reflect directory name changes in prep for merging develop to main
|
||||||
|
#
|
||||||
# 1.5: 12 May 2024
|
# 1.5: 12 May 2024
|
||||||
# "dr-freedata-001" branch of codec2 merged to main so we don't
|
# "dr-freedata-001" branch of codec2 merged to main so we don't
|
||||||
# need to checkout that branch specifically
|
# need to checkout that branch specifically
|
||||||
|
#
|
||||||
# 1.4: 05 May 2024
|
# 1.4: 05 May 2024
|
||||||
# Change to "dr-freedata-001" branch of codec2 for develop mode
|
# Change to "dr-freedata-001" branch of codec2 for develop mode
|
||||||
# Added comments in scripts and README.txt for config file location
|
# Added comments in scripts and README.txt for config file location
|
||||||
|
@ -267,12 +271,7 @@ pip install --upgrade -r requirements.txt
|
||||||
echo "*************************************************************************"
|
echo "*************************************************************************"
|
||||||
echo "Changing into the server directory"
|
echo "Changing into the server directory"
|
||||||
echo "*************************************************************************"
|
echo "*************************************************************************"
|
||||||
if [ "$args" == "develop" ];
|
|
||||||
then
|
|
||||||
cd freedata_server/lib
|
cd freedata_server/lib
|
||||||
else
|
|
||||||
cd modem/lib
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "*************************************************************************"
|
echo "*************************************************************************"
|
||||||
echo "Checking and removing any old codec2 libraries"
|
echo "Checking and removing any old codec2 libraries"
|
||||||
|
@ -298,12 +297,6 @@ else
|
||||||
exit 1
|
exit 1
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# Not currently needed
|
|
||||||
# if [ "$args" == "develop" ];
|
|
||||||
# then
|
|
||||||
# git checkout dr-freedata-001
|
|
||||||
# fi
|
|
||||||
|
|
||||||
echo "*************************************************************************"
|
echo "*************************************************************************"
|
||||||
echo "Setting up the codec2 build"
|
echo "Setting up the codec2 build"
|
||||||
echo "*************************************************************************"
|
echo "*************************************************************************"
|
||||||
|
@ -326,12 +319,7 @@ echo "*************************************************************************"
|
||||||
echo "Building the FreeDATA GUI frontend"
|
echo "Building the FreeDATA GUI frontend"
|
||||||
echo "*************************************************************************"
|
echo "*************************************************************************"
|
||||||
cd ../../../..
|
cd ../../../..
|
||||||
if [ "$args" == "develop" ];
|
|
||||||
then
|
|
||||||
cd freedata_gui
|
cd freedata_gui
|
||||||
else
|
|
||||||
cd gui
|
|
||||||
fi
|
|
||||||
npm i
|
npm i
|
||||||
npm audit fix --force
|
npm audit fix --force
|
||||||
npm i
|
npm i
|
||||||
|
|
Loading…
Reference in New Issue