More tweaks, bitmessage disabled for now.

This commit is contained in:
tb14
2022-10-15 11:08:13 -05:00
parent 3ead8b5e49
commit 6b8bad9553
2 changed files with 50 additions and 18 deletions
+46 -18
View File
@@ -407,7 +407,7 @@ fi
echo "90% Complete"
NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | sed -n 's/<h3>Latest\ Stable\ Release\ //p' | awk -F '(' '{print $1}' | sed 's/-\ //')
NEWVC=$(curl -s https://www.veracrypt.fr/en/Downloads.html | sed -n 's/<h3>Latest\ Stable\ Release\ //p' | awk -F '(' '{print $1}' | sed 's/-\ //' | sed 's/\ //' )
if [[ $NEWVC == "" ]]; then
NEWVC="SERVER DOWN"
fi
@@ -581,8 +581,13 @@ if [[ -d $USERDIR/hamlib-$NEWHAMLIB ]]; then
else
# tcl8.5-dev libsigc++-1.2-dev, Trying libsigc++-2.0-dev tcl8.6-dev
#sudo apt-get install -y cmake build-essential libusb-1.0-0.dev libltdl-dev libusb-1.0-0 libhamlib-utils libsamplerate0 libsamplerate0-dev libsigx-2.0-dev libsigc++-2.0-dev libpopt-dev tcl8.6-dev libspeex-dev libasound2-dev alsa-utils libgcrypt20-dev libpopt-dev libfltk1.3-dev libpng++-dev portaudio19-dev libpulse-dev libportaudiocpp0 libsndfile1-dev ||
##This was Debian 10 based.
##sudo apt-get install -y cmake build-essential libusb-1.0-0.dev libltdl-dev libusb-1.0-0 libhamlib-utils libsamplerate0 libsamplerate0-dev libsigx-2.0-dev libsigc++-2.0-dev libpopt-dev tcl8.6-dev libspeex-dev libasound2-dev alsa-utils libgcrypt20-dev libpopt-dev libfltk1.3-dev libpng++-dev portaudio19-dev libpulse-dev libportaudiocpp0 libsndfile1-dev ||
#This seems to be all thats needed for Debian 11 based
sudo apt-get install -y libusb-1.0-0.dev libusb-1.0-0 ||
{ ERRCODE="Failed to build dependencies for Hamlib"; errors; return; }
cd $USERDIR && wget -N https://sourceforge.net/projects/hamlib/files/hamlib/${NEWHAMLIB}/hamlib-${NEWHAMLIB}.tar.gz ||
@@ -1375,27 +1380,28 @@ function js8call_install() {
JS8PKG=$(curl -s http://files.js8call.com/latest.html | grep .tgz | sed 's/.*js8call-/js8call-/;s/<.*$//')
JS8VERSION=$(echo $JS8PKG | sed 's/js8call-//;s/.tgz.*$//')
JS8DIR=
mkdir -p wget -P $USERDIR/ -N http://files.js8call.com/$JS8VERSION/$JS8PKG ||
wget -P $USERDIR/ -N http://files.js8call.com/$JS8VERSION/$JS8PKG ||
{ ERRCODE="Failed to download JS8Call"; errors; return; }
tar -xvf $JS8PKG
rm $JS8PKG
cd ${BUILDDIR}/js8call
echo "#################"
echo "Compiling JS8Call"
echo "#################"
cmake -D CMAKE_INSTALL_PREFIX=$HOME/Downloads/js8call
cmake --build . -- -j4
sudo cp js8 js8call /usr/local/bin
cd $USERDIR && tar -xvf $USERDIR/$JS8PKG && rm $USERDIR/$JS8PKG ||
{ ERRCODE="Unable to extract JS8call Source Code"; errors; return; }
cd $USERDIR/js8call
cmake . && cmake --build . -- -j4 && sudo make install ||
{ ERRCODE="Failed to build JS8Call."; errors; return; }
}
function ublox_gps_setup() {
sudo apt-get -y install gpsd gpsd-clients python-gps chrony ||
#Deps from Debian 10
#sudo apt-get -y install gpsd gpsd-clients python-gps chrony ||
sudo apt install -y gpsd gpsd-clients gpsd-tools chrony ||
{ ERRCODE="Failed to install gpsd gpsd-clients python-gps chrony packages"; errors; return; }
if [[ -f /etc/default/gpsd ]]; then
@@ -2551,7 +2557,7 @@ VCFILE=$(echo ${VCLINK} | awk -F '/' '{print $8}')
function bitmessage_install() {
function bitmessage_install_old() {
if hash pybitmessage 2>/dev/null; then
cd $SECDIR/PyBitmessage/src && git fetch --all && git reset --hard \
@@ -2574,6 +2580,28 @@ echo pybitmessagesetup >> /tmp/cleanup
}
function bitmessage_install() {
if hash pybitmessage 2>/dev/null; then
cd $SECDIR/PyBitmessage/src && git fetch --all && git reset --hard \
origin/master ||
{ ERRCODE="Failed to update Bitmessage"; errors; return; }
else
sudo apt-get install -y python openssl libssl-dev git python-msgpack python-qt4 ||
{ ERRCODE="Failed to get dependencies for Bitmessage"; errors; return; }
cd $SECDIR/ && git clone https://github.com/Bitmessage/PyBitmessage ||
{ ERRCODE="Failed to download Bitmessage"; errors; return; }
cd $SECDIR/PyBitmessage && sudo python setup.py install ||
{ ERRCODE="Failed to install Bitmessage"; errors; return; }
fi
echo pybitmessagesetup >> /tmp/cleanup
}
function wifi_off() {
if [[ ${PLAT} = "Raspbian" ]]; then
if grep -q dtoverlay=pi3-disable-wifi /boot/config.txt; then
@@ -3439,8 +3467,8 @@ cat /tmp/results | yad --text-info --center \
PFE) echo "Installing Paranoia File Encrypter"
pfe_install
;;
BITMESSAGE) echo "Installing Bitmessage"
bitmessage_install
BITMESSAGE) echo "TEMP DISABLED-Installing Bitmessage"
#bitmessage_install
;;
VERACRYPT) echo "Installing Veracrypt"
veracrypt_install
+4
View File
@@ -11,6 +11,10 @@
- Fixed version checking errors for ARDOP / Veracrypt / ARDOP GUI
- Disabled WSJTX / VOACAP
- Changed JS8 to source install
- Fixed Veracrypt version check formatting
- Changed ublox gpsd deps
- disabled bitmessage install
- tweaked JS8 install function
# Version 0.6.9
- Corrected wsjt-x address from http to https