From 790a4e7fb9d61f87142a85fa69eb1d43769c14ea Mon Sep 17 00:00:00 2001 From: Luigi Freitas Cruz Date: Sun, 23 Feb 2020 18:26:08 -0300 Subject: [PATCH] Multiple fixes. --- .github/workflows/release.yml | 16 ++++++++------- .github/workflows/validate.yml | 14 ++++++++----- builder/stage4/04-pisdr-system/00-packages | 2 ++ builder/stage4/04-pisdr-system/01-run.sh | 19 ++++++++++-------- builder/stage4/04-pisdr-system/02-run.sh | 7 +++++++ .../wallpaper/desktop-items-0.conf | 4 ++++ builder/stage4/05-pisdr-gnuradio/00-run.sh | 4 ++-- builder/stage4/06-pisdr-soapysdr/01-run.sh | 4 ++-- builder/stage4/06-pisdr-soapysdr/02-run.sh | 4 ++-- builder/stage4/06-pisdr-soapysdr/03-run.sh | 4 ++-- builder/stage4/07-pisdr-limesdr/00-run.sh | 4 ++-- builder/stage4/07-pisdr-limesdr/01-run.sh | 4 ++-- builder/stage4/08-pisdr-airspy/00-run.sh | 4 ++-- builder/stage4/08-pisdr-airspy/01-run.sh | 4 ++-- builder/stage4/08-pisdr-airspy/02-run.sh | 4 ++-- builder/stage4/08-pisdr-airspy/03-run.sh | 20 +++++++++++++++++++ builder/stage4/09-pisdr-rtlsdr/00-run.sh | 4 ++-- builder/stage4/09-pisdr-rtlsdr/01-run.sh | 4 ++-- builder/stage4/10-pisdr-plutosdr/00-run.sh | 4 ++-- builder/stage4/10-pisdr-plutosdr/01-run.sh | 4 ++-- builder/stage4/10-pisdr-plutosdr/02-run.sh | 4 ++-- builder/stage4/10-pisdr-plutosdr/03-run.sh | 4 ++-- builder/stage4/11-pisdr-osmocom/00-run.sh | 4 ++-- builder/stage4/12-pisdr-sdrangel/00-run.sh | 4 ++-- builder/stage4/12-pisdr-sdrangel/01-run.sh | 4 ++-- builder/stage4/12-pisdr-sdrangel/02-run.sh | 4 ++-- builder/stage4/12-pisdr-sdrangel/03-run.sh | 4 ++-- builder/stage4/12-pisdr-sdrangel/04-run.sh | 4 ++-- builder/stage4/12-pisdr-sdrangel/05-run.sh | 4 ++-- builder/stage4/13-pisdr-gqrx/00-run.sh | 4 ++-- 30 files changed, 108 insertions(+), 66 deletions(-) create mode 100644 builder/stage4/04-pisdr-system/00-packages create mode 100755 builder/stage4/04-pisdr-system/02-run.sh create mode 100644 builder/stage4/04-pisdr-system/wallpaper/desktop-items-0.conf create mode 100755 builder/stage4/08-pisdr-airspy/03-run.sh diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 6a12db5..63ef42e 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -15,19 +15,21 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 + - name: Clean docker + id: clean_docker + working-directory: ${{ env.working-directory }} + run: | + docker system prune -af + docker system prune --volumes -f + docker container stop $(docker container ls -aq) + docker container rm $(docker container ls -aq) + docker image prune -af - name: Build project id: builder working-directory: ${{ env.working-directory }} - env: - CONTINUE: 1 run: | bash build-docker.sh echo ::set-output name=filename::$(ls deploy/*.tar.xz | xargs -n 1 basename) - - name: Fix Permissions - id: fix_perm_filename - run: | - chmod a+rw ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }} - echo ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }} - name: Create Release id: create_release uses: actions/create-release@v1 diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml index fa7b1fc..360e175 100644 --- a/.github/workflows/validate.yml +++ b/.github/workflows/validate.yml @@ -12,17 +12,21 @@ jobs: steps: - name: Checkout code uses: actions/checkout@v2 + - name: Clean docker + id: clean_docker + working-directory: ${{ env.working-directory }} + run: | + docker system prune -af + docker system prune --volumes -f + docker container stop $(docker container ls -aq) + docker container rm $(docker container ls -aq) + docker image prune -af - name: Build project id: builder working-directory: ${{ env.working-directory }} run: | bash build-docker.sh echo ::set-output name=filename::$(ls deploy/*.tar.xz | xargs -n 1 basename) - - name: Fix Permissions - id: fix_perm_filename - run: | - chmod a+rw ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }} - echo ${{ env.working-directory }}/deploy/${{ steps.builder.outputs.filename }} - uses: actions/upload-artifact@v1 with: name: ${{ steps.builder.outputs.filename }} diff --git a/builder/stage4/04-pisdr-system/00-packages b/builder/stage4/04-pisdr-system/00-packages new file mode 100644 index 0000000..7485a06 --- /dev/null +++ b/builder/stage4/04-pisdr-system/00-packages @@ -0,0 +1,2 @@ +vim +tmux \ No newline at end of file diff --git a/builder/stage4/04-pisdr-system/01-run.sh b/builder/stage4/04-pisdr-system/01-run.sh index 0d2b3cb..90f94a6 100755 --- a/builder/stage4/04-pisdr-system/01-run.sh +++ b/builder/stage4/04-pisdr-system/01-run.sh @@ -1,10 +1,13 @@ -install -m 755 shortcut/gnuradio.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop" -install -m 755 shortcut/gqrx.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop" -install -m 755 shortcut/sdrangel.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop" +install -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop" +install -D -m 755 shortcut/gnuradio.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop" +install -D -m 755 shortcut/gqrx.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop" +install -D -m 755 shortcut/sdrangel.desktop "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/Desktop" -install -m 755 wallpaper/donald-giannatti-vla.jpg "${ROOTFS_DIR}/usr/share/rpd-wallpaper/" +install -D -m 755 wallpaper/donald-giannatti-vla.jpg "${ROOTFS_DIR}/usr/share/rpd-wallpaper/" -on_chroot << EOF -rm -fr /usr/share/rpd-wallpaper/road.jpg -mv /usr/share/rpd-wallpaper/donald-giannatti-vla.jpg /usr/share/rpd-wallpaper/road.jpg -EOF \ No newline at end of file +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/menus/" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/pcmanfm/" +install -v -o 1000 -g 1000 -d "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/pcmanfm/LXDE-pi/" + +install -v -o 1000 -g 1000 -m 644 wallpaper/desktop-items-0.conf "${ROOTFS_DIR}/home/${FIRST_USER_NAME}/.config/pcmanfm/LXDE-pi/" \ No newline at end of file diff --git a/builder/stage4/04-pisdr-system/02-run.sh b/builder/stage4/04-pisdr-system/02-run.sh new file mode 100755 index 0000000..22dd2e6 --- /dev/null +++ b/builder/stage4/04-pisdr-system/02-run.sh @@ -0,0 +1,7 @@ +#!/bin/bash -e + +on_chroot << EOF +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +EOF \ No newline at end of file diff --git a/builder/stage4/04-pisdr-system/wallpaper/desktop-items-0.conf b/builder/stage4/04-pisdr-system/wallpaper/desktop-items-0.conf new file mode 100644 index 0000000..5c29f8f --- /dev/null +++ b/builder/stage4/04-pisdr-system/wallpaper/desktop-items-0.conf @@ -0,0 +1,4 @@ +[*] +wallpaper_mode=crop +wallpaper_common=1 +wallpaper=/usr/share/rpd-wallpaper/donald-giannatti-vla.jpg \ No newline at end of file diff --git a/builder/stage4/05-pisdr-gnuradio/00-run.sh b/builder/stage4/05-pisdr-gnuradio/00-run.sh index af7515e..8065d52 100755 --- a/builder/stage4/05-pisdr-gnuradio/00-run.sh +++ b/builder/stage4/05-pisdr-gnuradio/00-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/GNURadio" -cd "/home/${FIRST_USER_NAME}/GNURadio" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "gnuradio" ]; then git clone --recursive https://github.com/gnuradio/gnuradio.git diff --git a/builder/stage4/06-pisdr-soapysdr/01-run.sh b/builder/stage4/06-pisdr-soapysdr/01-run.sh index 455fb31..7d54990 100755 --- a/builder/stage4/06-pisdr-soapysdr/01-run.sh +++ b/builder/stage4/06-pisdr-soapysdr/01-run.sh @@ -1,8 +1,8 @@ #!/bin/bash on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Packages" -cd "/home/${FIRST_USER_NAME}/Packages" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "SoapySDR" ]; then git clone https://github.com/pothosware/SoapySDR.git diff --git a/builder/stage4/06-pisdr-soapysdr/02-run.sh b/builder/stage4/06-pisdr-soapysdr/02-run.sh index cb158a3..5662cf6 100755 --- a/builder/stage4/06-pisdr-soapysdr/02-run.sh +++ b/builder/stage4/06-pisdr-soapysdr/02-run.sh @@ -1,8 +1,8 @@ #!/bin/bash on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Packages" -cd "/home/${FIRST_USER_NAME}/Packages" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "SoapyRemote" ]; then git clone https://github.com/pothosware/SoapyRemote.git diff --git a/builder/stage4/06-pisdr-soapysdr/03-run.sh b/builder/stage4/06-pisdr-soapysdr/03-run.sh index 99cdc23..18ba766 100755 --- a/builder/stage4/06-pisdr-soapysdr/03-run.sh +++ b/builder/stage4/06-pisdr-soapysdr/03-run.sh @@ -1,8 +1,8 @@ #!/bin/bash on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Packages" -cd "/home/${FIRST_USER_NAME}/Packages" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "gr-soapy" ]; then git clone https://gitlab.com/librespacefoundation/gr-soapy.git diff --git a/builder/stage4/07-pisdr-limesdr/00-run.sh b/builder/stage4/07-pisdr-limesdr/00-run.sh index 0cd9c79..c4120fe 100755 --- a/builder/stage4/07-pisdr-limesdr/00-run.sh +++ b/builder/stage4/07-pisdr-limesdr/00-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/LimeSDR" -cd "/home/${FIRST_USER_NAME}/LimeSDR" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "LimeSuite" ]; then git clone https://github.com/myriadrf/LimeSuite.git diff --git a/builder/stage4/07-pisdr-limesdr/01-run.sh b/builder/stage4/07-pisdr-limesdr/01-run.sh index de55a24..ad4865c 100755 --- a/builder/stage4/07-pisdr-limesdr/01-run.sh +++ b/builder/stage4/07-pisdr-limesdr/01-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/LimeSDR" -cd "/home/${FIRST_USER_NAME}/LimeSDR" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "gr-limesdr" ]; then git clone https://github.com/myriadrf/gr-limesdr.git diff --git a/builder/stage4/08-pisdr-airspy/00-run.sh b/builder/stage4/08-pisdr-airspy/00-run.sh index ebff4f1..09fe7cc 100755 --- a/builder/stage4/08-pisdr-airspy/00-run.sh +++ b/builder/stage4/08-pisdr-airspy/00-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Airspy" -cd "/home/${FIRST_USER_NAME}/Airspy" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "airspyone_host" ]; then git clone https://github.com/airspy/airspyone_host.git diff --git a/builder/stage4/08-pisdr-airspy/01-run.sh b/builder/stage4/08-pisdr-airspy/01-run.sh index 709b211..083ef08 100755 --- a/builder/stage4/08-pisdr-airspy/01-run.sh +++ b/builder/stage4/08-pisdr-airspy/01-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Airspy" -cd "/home/${FIRST_USER_NAME}/Airspy" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "airspyhf" ]; then git clone https://github.com/airspy/airspyhf.git diff --git a/builder/stage4/08-pisdr-airspy/02-run.sh b/builder/stage4/08-pisdr-airspy/02-run.sh index b5c6ad9..73e6363 100755 --- a/builder/stage4/08-pisdr-airspy/02-run.sh +++ b/builder/stage4/08-pisdr-airspy/02-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Airspy" -cd "/home/${FIRST_USER_NAME}/Airspy" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "SoapyAirspy" ]; then git clone https://github.com/pothosware/SoapyAirspy.git diff --git a/builder/stage4/08-pisdr-airspy/03-run.sh b/builder/stage4/08-pisdr-airspy/03-run.sh new file mode 100755 index 0000000..44cce18 --- /dev/null +++ b/builder/stage4/08-pisdr-airspy/03-run.sh @@ -0,0 +1,20 @@ +#!/bin/bash -e + +on_chroot << EOF +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" + +if [ ! -d "SoapyAirspyHF" ]; then + git clone https://github.com/pothosware/SoapyAirspyHF.git +fi + +cd SoapyAirspyHF +git pull +mkdir -p build +cd build +cmake -DCMAKE_CXX_FLAGS=-latomic ../ +make -j$(nproc) install +ldconfig +EOF + + diff --git a/builder/stage4/09-pisdr-rtlsdr/00-run.sh b/builder/stage4/09-pisdr-rtlsdr/00-run.sh index 534d564..49dc97f 100755 --- a/builder/stage4/09-pisdr-rtlsdr/00-run.sh +++ b/builder/stage4/09-pisdr-rtlsdr/00-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/RTLSDR" -cd "/home/${FIRST_USER_NAME}/RTLSDR" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "rtl-sdr" ]; then git clone https://github.com/osmocom/rtl-sdr diff --git a/builder/stage4/09-pisdr-rtlsdr/01-run.sh b/builder/stage4/09-pisdr-rtlsdr/01-run.sh index 808a776..dc86b76 100755 --- a/builder/stage4/09-pisdr-rtlsdr/01-run.sh +++ b/builder/stage4/09-pisdr-rtlsdr/01-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/RTLSDR" -cd "/home/${FIRST_USER_NAME}/RTLSDR" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "SoapyRTLSDR" ]; then git clone https://github.com/pothosware/SoapyRTLSDR.git diff --git a/builder/stage4/10-pisdr-plutosdr/00-run.sh b/builder/stage4/10-pisdr-plutosdr/00-run.sh index f61a448..2ed975c 100755 --- a/builder/stage4/10-pisdr-plutosdr/00-run.sh +++ b/builder/stage4/10-pisdr-plutosdr/00-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/PlutoSDR" -cd "/home/${FIRST_USER_NAME}/PlutoSDR" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "libiio" ]; then git clone https://github.com/analogdevicesinc/libiio diff --git a/builder/stage4/10-pisdr-plutosdr/01-run.sh b/builder/stage4/10-pisdr-plutosdr/01-run.sh index 0da3211..c2a5423 100755 --- a/builder/stage4/10-pisdr-plutosdr/01-run.sh +++ b/builder/stage4/10-pisdr-plutosdr/01-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/PlutoSDR" -cd "/home/${FIRST_USER_NAME}/PlutoSDR" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "libad9361-iio" ]; then git clone https://github.com/analogdevicesinc/libad9361-iio diff --git a/builder/stage4/10-pisdr-plutosdr/02-run.sh b/builder/stage4/10-pisdr-plutosdr/02-run.sh index 2ad2698..5bf5094 100755 --- a/builder/stage4/10-pisdr-plutosdr/02-run.sh +++ b/builder/stage4/10-pisdr-plutosdr/02-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/PlutoSDR" -cd "/home/${FIRST_USER_NAME}/PlutoSDR" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "gr-iio" ]; then git clone https://github.com/analogdevicesinc/gr-iio diff --git a/builder/stage4/10-pisdr-plutosdr/03-run.sh b/builder/stage4/10-pisdr-plutosdr/03-run.sh index 3f78482..0bed7ff 100755 --- a/builder/stage4/10-pisdr-plutosdr/03-run.sh +++ b/builder/stage4/10-pisdr-plutosdr/03-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/PlutoSDR" -cd "/home/${FIRST_USER_NAME}/PlutoSDR" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Radios" +cd "/home/${FIRST_USER_NAME}/PiSDR/Radios" if [ ! -d "SoapyPlutoSDR" ]; then git clone https://github.com/pothosware/SoapyPlutoSDR.git diff --git a/builder/stage4/11-pisdr-osmocom/00-run.sh b/builder/stage4/11-pisdr-osmocom/00-run.sh index f7f453a..19d7ff3 100755 --- a/builder/stage4/11-pisdr-osmocom/00-run.sh +++ b/builder/stage4/11-pisdr-osmocom/00-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Software" -cd "/home/${FIRST_USER_NAME}/Software" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "gr-osmosdr" ]; then git clone git://git.osmocom.org/gr-osmosdr diff --git a/builder/stage4/12-pisdr-sdrangel/00-run.sh b/builder/stage4/12-pisdr-sdrangel/00-run.sh index 5df88c3..994cfb7 100755 --- a/builder/stage4/12-pisdr-sdrangel/00-run.sh +++ b/builder/stage4/12-pisdr-sdrangel/00-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Software" -cd "/home/${FIRST_USER_NAME}/Software" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "cm256cc" ]; then git clone https://github.com/f4exb/cm256cc.git diff --git a/builder/stage4/12-pisdr-sdrangel/01-run.sh b/builder/stage4/12-pisdr-sdrangel/01-run.sh index 1d37b26..1725dfb 100755 --- a/builder/stage4/12-pisdr-sdrangel/01-run.sh +++ b/builder/stage4/12-pisdr-sdrangel/01-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Software" -cd "/home/${FIRST_USER_NAME}/Software" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "mbelib" ]; then git clone https://github.com/szechyjs/mbelib.git diff --git a/builder/stage4/12-pisdr-sdrangel/02-run.sh b/builder/stage4/12-pisdr-sdrangel/02-run.sh index 756f50d..58188e0 100755 --- a/builder/stage4/12-pisdr-sdrangel/02-run.sh +++ b/builder/stage4/12-pisdr-sdrangel/02-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Software" -cd "/home/${FIRST_USER_NAME}/Software" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "serialDV" ]; then git clone https://github.com/f4exb/serialDV.git diff --git a/builder/stage4/12-pisdr-sdrangel/03-run.sh b/builder/stage4/12-pisdr-sdrangel/03-run.sh index 7f9162e..e6e8df0 100755 --- a/builder/stage4/12-pisdr-sdrangel/03-run.sh +++ b/builder/stage4/12-pisdr-sdrangel/03-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Software" -cd "/home/${FIRST_USER_NAME}/Software" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "dsdcc" ]; then git clone https://github.com/f4exb/dsdcc.git diff --git a/builder/stage4/12-pisdr-sdrangel/04-run.sh b/builder/stage4/12-pisdr-sdrangel/04-run.sh index 3ec1921..8b369e7 100755 --- a/builder/stage4/12-pisdr-sdrangel/04-run.sh +++ b/builder/stage4/12-pisdr-sdrangel/04-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Software" -cd "/home/${FIRST_USER_NAME}/Software" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "codec2" ]; then git clone https://github.com/drowe67/codec2.git diff --git a/builder/stage4/12-pisdr-sdrangel/05-run.sh b/builder/stage4/12-pisdr-sdrangel/05-run.sh index 34e361b..77da4c0 100755 --- a/builder/stage4/12-pisdr-sdrangel/05-run.sh +++ b/builder/stage4/12-pisdr-sdrangel/05-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Software" -cd "/home/${FIRST_USER_NAME}/Software" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "sdrangel" ]; then git clone https://github.com/f4exb/sdrangel.git diff --git a/builder/stage4/13-pisdr-gqrx/00-run.sh b/builder/stage4/13-pisdr-gqrx/00-run.sh index 8629c1a..395718c 100755 --- a/builder/stage4/13-pisdr-gqrx/00-run.sh +++ b/builder/stage4/13-pisdr-gqrx/00-run.sh @@ -1,8 +1,8 @@ #!/bin/bash -e on_chroot << EOF -mkdir -p "/home/${FIRST_USER_NAME}/Software" -cd "/home/${FIRST_USER_NAME}/Software" +mkdir -p "/home/${FIRST_USER_NAME}/PiSDR/Software" +cd "/home/${FIRST_USER_NAME}/PiSDR/Software" if [ ! -d "gqrx" ]; then git clone https://github.com/csete/gqrx.git