Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rename install script to "install-jukebox.sh" #2110

Merged
merged 2 commits into from
Nov 14, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/components/controls/buttons_usb_encoder/ @jeripeierSBB
/components/synchronisation/sync-shared @AlvinSchiller
/scripts/installscripts/buster-install-default.sh @jeripeierSBB
/scripts/installscripts/install-jukebox.sh @jeripeierSBB
/scripts/helperscripts/setup_autohotspot.sh @Groovylein
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/bug_template.md
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ the following command will help with that
### Installscript

<!--
i.e. `scripts/installscripts/buster-install-default.sh`
i.e. `scripts/installscripts/install-jukebox.sh`
-->


Expand Down
2 changes: 1 addition & 1 deletion ci/Dockerfile.debian
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ RUN export DEBIAN_FRONTEND=noninteractive \
&& sed 's/#.*//g' packages-raspberrypi.txt | xargs apt-get -y install \
&& rm -rf /var/lib/apt/lists/*

COPY --chown=root:$TEST_USER_GROUP --chmod=770 scripts/installscripts/buster-install-default.sh ./
COPY --chown=root:$TEST_USER_GROUP --chmod=770 scripts/installscripts/install-jukebox.sh ./
WORKDIR /tests
COPY --chown=root:$TEST_USER_GROUP --chmod=770 scripts/installscripts/tests/*.sh ./

Expand Down
4 changes: 2 additions & 2 deletions ci/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -43,9 +43,9 @@ This is a work in progress so expect things to fail or being flaky.
```bash
docker run --rm -ti rpi-jukebox-rfid:debian-latest /bin/bash
cd /home/pi/
cp /code/scripts/installscripts/buster-install-default.sh /home/pi/
cp /code/scripts/installscripts/install-jukebox.sh /home/pi/
# set GIT_URL and GIT_BRANCH appropriately to your checkout
bash GIT_URL=https://github.com/MiczFlor/RPi-Jukebox-RFID.git GIT_BRANCH=main buster-install-default.sh
bash GIT_URL=https://github.com/MiczFlor/RPi-Jukebox-RFID.git GIT_BRANCH=main install-jukebox.sh
```

NOTE: Get familiar with docker and its flags - `--rm` for example will remove the
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
# 2. make the file executable: chmod +x
# 3. place the PhonieboxInstall.conf in the folder $HOME
# 4. run the installscript with option -a like this:
# buster-install-default.sh -a
# install-jukebox.sh -a

# The absolute path to the folder which contains this script
PATHDATA="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
Expand Down Expand Up @@ -138,7 +138,7 @@ an existing configuration file, do the following:
1. exit this install script (press n)
2. place your PhonieboxInstall.conf in the folder ${HOME_DIR}
3. run the installscript with option -a. For example like this:
${HOME_DIR}/buster-install-default.sh -a
${HOME_DIR}/install-jukebox.sh -a
"
read -rp "Continue interactive installation? [Y/n] " response
case "$response" in
Expand Down Expand Up @@ -522,7 +522,7 @@ https://github.com/MiczFlor/RPi-Jukebox-RFID/wiki/Using-GPIO-hardware-buttons"
*)
cd "${local_home_dir}"
clear
./buster-install-default.sh -a
./install-jukebox.sh -a
exit
;;
esac
Expand Down
2 changes: 1 addition & 1 deletion scripts/installscripts/tests/run_installation_tests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
# n no RFID registration
# n No reboot

./../buster-install-default.sh <<< $'y\nn\n\ny\ny\n\ny\n\nn\n\ny\n\ny\n\ny\n\ny\nn\nn\n'
./../install-jukebox.sh <<< $'y\nn\n\ny\ny\n\ny\n\nn\n\ny\n\ny\n\ny\n\ny\nn\nn\n'
INSTALLATION_EXITCODE=$?

# Test installation
Expand Down
2 changes: 1 addition & 1 deletion scripts/installscripts/tests/run_installation_tests2.sh
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
# yes, reader is connected
# n No reboot

./../buster-install-default.sh <<< $'y\nn\n\nn\n\ny\n\nn\n\ny\n\ny\n\ny\n\ny\ny\n2\ny\nn\n'
./../install-jukebox.sh <<< $'y\nn\n\nn\n\ny\n\nn\n\ny\n\ny\n\ny\n\ny\ny\n2\ny\nn\n'
INSTALLATION_EXITCODE=$?

# Test installation
Expand Down
2 changes: 1 addition & 1 deletion scripts/installscripts/tests/run_installation_tests3.sh
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ echo 'debconf debconf/frontend select Noninteractive' | sudo debconf-set-selecti
# n no RFID registration
# n No reboot

./../buster-install-default.sh <<< $'y\nn\n\nn\n\ny\n\ny\nmyuser\nmypassword\nmyclient_id\nmyclient_secret\n\ny\n\ny\n\ny\n\ny\nn\nn\n'
./../install-jukebox.sh <<< $'y\nn\n\nn\n\ny\n\ny\nmyuser\nmypassword\nmyclient_id\nmyclient_secret\n\ny\n\ny\n\ny\n\ny\nn\nn\n'
INSTALLATION_EXITCODE=$?

# Test installation
Expand Down
Loading