mirror of
https://gitlab.com/amrron/setup-scripts.git
synced 2026-10-17 01:54:00 -04:00
PLAT -> uname -m
This commit is contained in:
+22
-22
@@ -658,13 +658,13 @@ fi
|
|||||||
tar.gz && cd fldigi-${NEWFLDIGI} ||
|
tar.gz && cd fldigi-${NEWFLDIGI} ||
|
||||||
{ ERRCODE="Failed to extract FLDIGI"; errors; return; }
|
{ ERRCODE="Failed to extract FLDIGI"; errors; return; }
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
./configure && make && sudo make install ||
|
./configure && make && sudo make install ||
|
||||||
{ ERRCODE="Failed to compile FLDIGI"; errors; return; }
|
{ ERRCODE="Failed to compile FLDIGI"; errors; return; }
|
||||||
else
|
else
|
||||||
./configure --enable-optimizations=native && make && sudo make \
|
./configure --enable-optimizations=native && make && sudo make \
|
||||||
install ||
|
install ||
|
||||||
{ ERRCODE="Failed to download FLDIGI"; errors; return; }
|
{ ERRCODE="Failed to compile FLDIGI"; errors; return; }
|
||||||
fi
|
fi
|
||||||
|
|
||||||
#Cleanup space from compiling
|
#Cleanup space from compiling
|
||||||
@@ -694,7 +694,7 @@ files/flmsg/flmsg-${NEWFLMSG}.tar.gz ||
|
|||||||
&& cd flmsg-${NEWFLMSG} ||
|
&& cd flmsg-${NEWFLMSG} ||
|
||||||
{ ERRCODE="Failed to extract FLMSG"; errors; return; }
|
{ ERRCODE="Failed to extract FLMSG"; errors; return; }
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
./configure && make && sudo make install ||
|
./configure && make && sudo make install ||
|
||||||
{ ERRCODE="Failed to compile FLMSG"; errors; return; }
|
{ ERRCODE="Failed to compile FLMSG"; errors; return; }
|
||||||
else
|
else
|
||||||
@@ -730,7 +730,7 @@ fi
|
|||||||
rm flamp-${NEWFLAMP}.tar.gz && cd flamp-${NEWFLAMP} ||
|
rm flamp-${NEWFLAMP}.tar.gz && cd flamp-${NEWFLAMP} ||
|
||||||
{ ERRCODE="Failed to extract FLAMP"; errors; return; }
|
{ ERRCODE="Failed to extract FLAMP"; errors; return; }
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
./configure && make && sudo make install ||
|
./configure && make && sudo make install ||
|
||||||
{ ERRCODE="Failed to compile FLAMP"; errors; return; }
|
{ ERRCODE="Failed to compile FLAMP"; errors; return; }
|
||||||
else
|
else
|
||||||
@@ -766,7 +766,7 @@ fi
|
|||||||
.tar.gz && cd flrig-${NEWFLRIG} ||
|
.tar.gz && cd flrig-${NEWFLRIG} ||
|
||||||
{ ERRCODE="Failed to extract FLRIG"; errors; return; }
|
{ ERRCODE="Failed to extract FLRIG"; errors; return; }
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
./configure && make && sudo make install ||
|
./configure && make && sudo make install ||
|
||||||
{ ERRCODE="Failed to compile FLRIG"; errors; return; }
|
{ ERRCODE="Failed to compile FLRIG"; errors; return; }
|
||||||
else
|
else
|
||||||
@@ -806,7 +806,7 @@ fi
|
|||||||
.tar.gz && cd flwrap-${NEWFLWRAP} ||
|
.tar.gz && cd flwrap-${NEWFLWRAP} ||
|
||||||
{ ERRCODE="Failed to extract FLWRAP"; errors; return; }
|
{ ERRCODE="Failed to extract FLWRAP"; errors; return; }
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
./configure && make && sudo make install ||
|
./configure && make && sudo make install ||
|
||||||
{ ERRCODE="Failed to compile FLWRAP"; errors; return; }
|
{ ERRCODE="Failed to compile FLWRAP"; errors; return; }
|
||||||
else
|
else
|
||||||
@@ -829,7 +829,7 @@ function ardop_install_old() {
|
|||||||
|
|
||||||
ARDOPDIR=$USERDIR/ARDOP
|
ARDOPDIR=$USERDIR/ARDOP
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
ARDOP=$"piardopc"
|
ARDOP=$"piardopc"
|
||||||
|
|
||||||
if [[ -f $ARDOPDIR/$ARDOP ]]; then
|
if [[ -f $ARDOPDIR/$ARDOP ]]; then
|
||||||
@@ -897,7 +897,7 @@ function ardop_install() {
|
|||||||
|
|
||||||
ARDOPDIR=$USERDIR/ARDOP
|
ARDOPDIR=$USERDIR/ARDOP
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
ARDOP=$"piardopc"
|
ARDOP=$"piardopc"
|
||||||
|
|
||||||
if [[ -f $ARDOPDIR/$ARDOP ]]; then
|
if [[ -f $ARDOPDIR/$ARDOP ]]; then
|
||||||
@@ -959,7 +959,7 @@ function ardop_gui_install() {
|
|||||||
|
|
||||||
ARDOPDIR=$USERDIR/ARDOP
|
ARDOPDIR=$USERDIR/ARDOP
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
ARDOPGUI=$"piARDOP_GUI"
|
ARDOPGUI=$"piARDOP_GUI"
|
||||||
|
|
||||||
if [[ -f $ARDOPDIR/$ARDOPGUI ]]; then
|
if [[ -f $ARDOPDIR/$ARDOPGUI ]]; then
|
||||||
@@ -1007,7 +1007,7 @@ fi
|
|||||||
|
|
||||||
function ardop_launcher() {
|
function ardop_launcher() {
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
local var1="piardopc"
|
local var1="piardopc"
|
||||||
local var13="piARDOP_GUI"
|
local var13="piARDOP_GUI"
|
||||||
else
|
else
|
||||||
@@ -1878,7 +1878,7 @@ if hash js8call 2>/dev/null; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
if hash direwolf 2>/dev/null; then
|
if hash direwolf 2>/dev/null; then
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
cd $PACKETDIR/direwolf && make install-rpi ||
|
cd $PACKETDIR/direwolf && make install-rpi ||
|
||||||
{ ERRCODE="Failed to create desktop icon for Direwolf"; errors; }
|
{ ERRCODE="Failed to create desktop icon for Direwolf"; errors; }
|
||||||
fi
|
fi
|
||||||
@@ -2106,7 +2106,7 @@ sudo apt-get -y install speedtest-cli
|
|||||||
|
|
||||||
function raspap_install() {
|
function raspap_install() {
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
wget -q https://git.io/voEUQ -O $HOME/Desktop/raspap ||
|
wget -q https://git.io/voEUQ -O $HOME/Desktop/raspap ||
|
||||||
{ ERRCODE="Failed to download RaspAP script"; errors; return; }
|
{ ERRCODE="Failed to download RaspAP script"; errors; return; }
|
||||||
|
|
||||||
@@ -2412,7 +2412,7 @@ EOF
|
|||||||
esac ||
|
esac ||
|
||||||
{ ERRCODE="Failed to create .conkyrc configuration file."; errors; return; }
|
{ ERRCODE="Failed to create .conkyrc configuration file."; errors; return; }
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
sed -i '/own_window_argb_value/d' $HOME/.conkyrc ||
|
sed -i '/own_window_argb_value/d' $HOME/.conkyrc ||
|
||||||
{ ERRCODE="Failed to remove own_window_argb_value from .conkyrc for raspbian stability"; errors; return; }
|
{ ERRCODE="Failed to remove own_window_argb_value from .conkyrc for raspbian stability"; errors; return; }
|
||||||
|
|
||||||
@@ -2727,7 +2727,7 @@ fi
|
|||||||
|
|
||||||
|
|
||||||
function wifi_off() {
|
function wifi_off() {
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
if grep -q dtoverlay=pi3-disable-wifi /boot/config.txt; then
|
if grep -q dtoverlay=pi3-disable-wifi /boot/config.txt; then
|
||||||
echo "Wifi is already disabled at boot"
|
echo "Wifi is already disabled at boot"
|
||||||
else
|
else
|
||||||
@@ -2763,7 +2763,7 @@ fi
|
|||||||
}
|
}
|
||||||
|
|
||||||
function bt_off() {
|
function bt_off() {
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
if grep -q dtoverlay=pi3-disable-bt /boot/config.txt; then
|
if grep -q dtoverlay=pi3-disable-bt /boot/config.txt; then
|
||||||
echo "Bluetooth is already disabled at boot"
|
echo "Bluetooth is already disabled at boot"
|
||||||
else
|
else
|
||||||
@@ -2797,7 +2797,7 @@ fi
|
|||||||
}
|
}
|
||||||
|
|
||||||
function wifi_on() {
|
function wifi_on() {
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
if grep -q dtoverlay=pi3-disable-wifi /boot/config.txt; then
|
if grep -q dtoverlay=pi3-disable-wifi /boot/config.txt; then
|
||||||
sudo sed -i s/dtoverlay=pi3-disable-wifi//g /boot/config.txt
|
sudo sed -i s/dtoverlay=pi3-disable-wifi//g /boot/config.txt
|
||||||
else
|
else
|
||||||
@@ -2810,7 +2810,7 @@ fi
|
|||||||
}
|
}
|
||||||
|
|
||||||
function bt_on() {
|
function bt_on() {
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
if grep -q dtoverlay=pi3-disable-bt /boot/config.txt; then
|
if grep -q dtoverlay=pi3-disable-bt /boot/config.txt; then
|
||||||
sudo sed -i s/dtoverlay=pi3-disable-bt//g /boot/config.txt
|
sudo sed -i s/dtoverlay=pi3-disable-bt//g /boot/config.txt
|
||||||
else
|
else
|
||||||
@@ -3200,7 +3200,7 @@ fi
|
|||||||
|
|
||||||
function enable_source_repositories() {
|
function enable_source_repositories() {
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
if [[ ${OSCN} = "stretch" ]]; then
|
if [[ ${OSCN} = "stretch" ]]; then
|
||||||
sudo echo 'deb-src http://raspbian.raspberrypi.org/raspbian/ stretch main contrib non-free rpi' | \
|
sudo echo 'deb-src http://raspbian.raspberrypi.org/raspbian/ stretch main contrib non-free rpi' | \
|
||||||
sudo tee -a /etc/apt/sources.list && sudo apt-get -y update && \
|
sudo tee -a /etc/apt/sources.list && sudo apt-get -y update && \
|
||||||
@@ -3241,7 +3241,7 @@ if [[ $rc -eq 0 ]]; then
|
|||||||
{ notify_sources_menu; return; }
|
{ notify_sources_menu; return; }
|
||||||
|
|
||||||
elif [[ $rc -eq 1 ]]; then
|
elif [[ $rc -eq 1 ]]; then
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
echo "This installer failed to modify your /etc/apt/sources.list/n/nPlease manually \
|
echo "This installer failed to modify your /etc/apt/sources.list/n/nPlease manually \
|
||||||
uncomment the deb-src line by removing the leading # before running this installer" | yad --center \
|
uncomment the deb-src line by removing the leading # before running this installer" | yad --center \
|
||||||
--image=$DIR/images/corps-icon.png \
|
--image=$DIR/images/corps-icon.png \
|
||||||
@@ -3317,7 +3317,7 @@ fi
|
|||||||
################################################################################
|
################################################################################
|
||||||
function swap_size_check() {
|
function swap_size_check() {
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
|
|
||||||
SWAPFILE=/etc/dphys-swapfile
|
SWAPFILE=/etc/dphys-swapfile
|
||||||
|
|
||||||
@@ -3883,7 +3883,7 @@ TEXT="VOACAPL pythonprop GUI does not support your OS."
|
|||||||
;;
|
;;
|
||||||
|
|
||||||
pybitmessagesetup)
|
pybitmessagesetup)
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
echo "Add @/usr/local/bin/pybitmessage to the file /etc/xdg/lxsession/LXDE-pi/autostart \
|
echo "Add @/usr/local/bin/pybitmessage to the file /etc/xdg/lxsession/LXDE-pi/autostart \
|
||||||
to enable autostart of pybitmessage on the Pi. Would you like me to attempt to do this now?" | yad \
|
to enable autostart of pybitmessage on the Pi. Would you like me to attempt to do this now?" | yad \
|
||||||
--text-info --image=$DIR/images/corps-icon.png --center --wrap \
|
--text-info --image=$DIR/images/corps-icon.png --center --wrap \
|
||||||
@@ -3919,7 +3919,7 @@ Would you like me to attempt to do this now?" | yad --image=$DIR/images/corps-ic
|
|||||||
rc=$?
|
rc=$?
|
||||||
if [[ $rc -eq 2 ]]; then
|
if [[ $rc -eq 2 ]]; then
|
||||||
|
|
||||||
if [[ ${PLAT} = "Raspbian" ]]; then
|
if [[ $(uname -m) = aarch64 ]]; then
|
||||||
echo "@/usr/bin/conky -p 8 -d" | sudo tee -a /etc/xdg/lxsession/LXDE-pi/autostart ||
|
echo "@/usr/bin/conky -p 8 -d" | sudo tee -a /etc/xdg/lxsession/LXDE-pi/autostart ||
|
||||||
{ ERRCODE="Failed to setup conky autostart"; errors; }
|
{ ERRCODE="Failed to setup conky autostart"; errors; }
|
||||||
|
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
- Veracrypt 64bit check
|
- Veracrypt 64bit check
|
||||||
- FLDIGI 64bit fix
|
- FLDIGI 64bit fix
|
||||||
- YAAC to jdk-11
|
- YAAC to jdk-11
|
||||||
|
- Changed Pi check from platform release to uname -m aarch64 check.
|
||||||
|
|
||||||
# Version 0.7.1
|
# Version 0.7.1
|
||||||
- Mint 21 tweaks
|
- Mint 21 tweaks
|
||||||
|
|||||||
Reference in New Issue
Block a user