updated release directory for 1.2

diff --git a/release/pihpsdr/install.sh b/release/pihpsdr/install.sh
index 6098a1f2d89f974cb321fe27573ea492b83252e9..34bbfdb20d60248bae19b9634dc98803e944a646 100755 (executable)
--- a/release/pihpsdr/install.sh
+++ b/release/pihpsdr/install.sh
@@ -1,23 +1,42 @@
+echo "installing fftw"
 sudo apt-get -y install libfftw3-3
-sudo apt-get -y install xscreensaver
-echo "removing old shared libraries"
+echo "removing old versions of pihpsdr"
+sudo rm -rf /usr/local/bin/pihpsdr
+echo "creating start script"
+cat <<EOT > start_pihpsdr.sh
+cd `pwd`
+sudo /usr/local/bin/pihpsdr
+EOT
+echo "creating desktop shortcut"
+cat <<EOT > pihpsdr.desktop
+#!/usr/bin/env xdg-open
+[Desktop Entry]
+Version=1.0
+Type=Application
+Terminal=false
+Name[eb_GB]=piHPSDR
+Exec=`pwd`/start_pihpsdr.sh
+Icon=`pwd`/hpsdr_icon.png
+Name=piHPSDR
+EOT
+cp pihpsdr.dshesktop ~/Desktop
+if [ ! -d "~/.local" ]; then
+  mkdir ~/.local
+fi
+if [ ! -d "~/.local/share" ]; then
+mkdir ~/.local/share
+fi
+if [ ! -d "~/.local/share/applications" ]; then
+mkdir ~/.local/share/applications
+fi
+cp pihpsdr.desktop ~/.local/share/applications
+echo "removing old versions of shared libraries"
 sudo rm -rf /usr/local/lib/libwdsp.so
-sudo rm -rf /usr/local/lib/libpsk.so
 sudo rm -rf /usr/local/lib/libcodec2.*
-sudo rm -rf /usr/local/lib/libSoapySDR.*
+echo "installing pihpsdr"
+sudo cp pihpsdr /usr/local/bin
 echo "installing shared libraries"
 sudo cp libwdsp.so /usr/local/lib
-sudo cp libpsk.so /usr/local/lib
-sudo cp libcodec2.so.0.5 /usr/local/lib
-sudo cp libSoapySDR.so.0.5-1 /usr/local/lib
-cd /usr/local/lib; sudo ln -s libcodec2.so.0.5 libcodec2.so
-cd /usr/local/lib; sudo ln -s libSoapySDR.so.0.5-1 libSoapySDR.so.0.5.0
-cd /usr/local/lib; sudo ln -s libSoapySDR.so.0.5-1 libSoapySDR.so
+sudo cp libcodec2.so.0.7 /usr/local/lib
+cd /usr/local/lib; sudo ln -s libcodec2.so.0.7 libcodec2.so
 sudo ldconfig
-echo "setting up for USB OZY device"
-cd ~/pihpsdr
-sudo cp 90-ozy.rules /etc/udev/rules.d
-sudo udevadm control --reload-rules
-echo "creating desktop icon"
-cp pihpsdr.desktop ~/Desktop
-cp pihpsdr.desktop ~/.local/share/applications

diff --git a/release/pihpsdr/latest b/release/pihpsdr/latest
deleted file mode 100644 (file)
index 3c61df3..0000000
--- a/release/pihpsdr/latest
+++ /dev/null
@@ -1 +0,0 @@
-v1.1.1-beta

diff --git a/release/pihpsdr/libcodec2.so.0.5 b/release/pihpsdr/libcodec2.so.0.5
deleted file mode 100755 (executable)
index 364d31c..0000000
Binary files a/release/pihpsdr/libcodec2.so.0.5 and /dev/null differ

diff --git a/release/pihpsdr/libcodec2.so.0.7 b/release/pihpsdr/libcodec2.so.0.7
new file mode 100755 (executable)
index 0000000..5038f4f
Binary files /dev/null and b/release/pihpsdr/libcodec2.so.0.7 differ

diff --git a/release/pihpsdr/libwdsp.so b/release/pihpsdr/libwdsp.so
index 375b8c727fa137f134479aeaeb9fe05285123d0b..744bf4b494d0527cba64299880894dd9e5e38978 100755 (executable)
Binary files a/release/pihpsdr/libwdsp.so and b/release/pihpsdr/libwdsp.so differ

diff --git a/release/pihpsdr/pihpsdr b/release/pihpsdr/pihpsdr
index 989756a5e9f5c90612d074a4aeca57f032141f58..31fb43b85377974277a69a4d57b18dd12dd30f05 100755 (executable)
Binary files a/release/pihpsdr/pihpsdr and b/release/pihpsdr/pihpsdr differ

diff --git a/release/pihpsdr/splash.png b/release/pihpsdr/splash.png
deleted file mode 100644 (file)
index 4b249eb..0000000
Binary files a/release/pihpsdr/splash.png and /dev/null differ

diff --git a/release/pihpsdr/start_pihpsdr.sh b/release/pihpsdr/start_pihpsdr.sh
deleted file mode 100755 (executable)
index 98af331..0000000
--- a/release/pihpsdr/start_pihpsdr.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-cd ~/pihpsdr
-sudo ~/pihpsdr/pihpsdr