Skip to content

Commit 18c58d4

Browse files
authored
v8.15 (#6161)
- CI | Add checks for trailing space and multiple newlines - Coding | Remove trailing spaces and multiple newlines
1 parent 90127ec commit 18c58d4

File tree

17 files changed

+36
-31
lines changed

17 files changed

+36
-31
lines changed

.build/images/OdroidC1/boot.ini

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@ setenv monitor_onoff "true"
5353
# - This might break boot for some brand models of cards.
5454
#setenv disableuhs "disableuhs"
5555

56-
5756
# Disable VPU (Video decoding engine, saves RAM!!!)
5857
# - 0 = disabled
5958
# - 1 = enabled (default)

.build/images/dietpi-build

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -151,7 +151,7 @@ case $DISTRO in
151151
21) ((root_size+=448));;
152152
*) :;;
153153
esac
154-
;;
154+
;;
155155
*) G_DIETPI-NOTIFY 1 "Invalid distro \"$DISTRO\" passed, aborting..."; exit 1;;
156156
esac
157157

.build/images/dietpi-imager

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -513,13 +513,13 @@
513513
[[ $(readlink -f "$PWD/$OUTPUT_IMG_NAME.$OUTPUT_IMG_EXT") != "$(readlink -f "$FP_SOURCE_IMG")" ]] && G_EXEC mv "$FP_SOURCE_IMG" "$OUTPUT_IMG_NAME.$OUTPUT_IMG_EXT"
514514

515515
# Check for sufficient free disk space to store the 7z archive with 100 MiB buffer
516-
G_CHECK_FREESPACE . $(( $IMAGE_SIZE * 15/100 / 1024**2 + 100 )) || exit 1
516+
G_CHECK_FREESPACE . $(( $IMAGE_SIZE * 15/100 / 1024**2 + 100 )) || exit 1
517517

518518
# Drive source and dd target
519519
elif [[ $CLONING_TOOL == 'dd' ]]
520520
then
521521
# Check for sufficient free disk space to store the image and the 7z archive with 100 MiB buffer
522-
G_CHECK_FREESPACE . $(( $IMAGE_SIZE * 115/100 / 1024**2 + 100 )) || exit 1
522+
G_CHECK_FREESPACE . $(( $IMAGE_SIZE * 115/100 / 1024**2 + 100 )) || exit 1
523523

524524
G_DIETPI-NOTIFY 2 "Creating final image with actually used size: $(( $IMAGE_SIZE / 1024**2 + 1 )) MiB"
525525
G_EXEC_OUTPUT=1 G_EXEC dd if="$FP_SOURCE" of="$OUTPUT_IMG_NAME.$OUTPUT_IMG_EXT" bs=1M status=progress count=$(( $IMAGE_SIZE / 1024**2 + 1 ))

.build/images/dietpi-installer

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1252,7 +1252,7 @@ _EOF_
12521252
aPACKAGES_REQUIRED_INSTALL+=('firmware-misc-nonfree') # Non-free misc incl. Ralink and MediaTek WiFi/BT
12531253
aPACKAGES_REQUIRED_INSTALL+=('firmware-realtek') # Realtek Eth/WiFi/BT
12541254
if (( $WIFI_REQUIRED ))
1255-
then
1255+
then
12561256
aPACKAGES_REQUIRED_INSTALL+=('firmware-atheros') # Qualcomm/Atheros WiFi/BT
12571257
aPACKAGES_REQUIRED_INSTALL+=('firmware-brcm80211') # Broadcom WiFi/BT
12581258
aPACKAGES_REQUIRED_INSTALL+=('firmware-iwlwifi') # Intel WiFi/BT

.build/software/gmediarender/build.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -168,7 +168,7 @@ Homepage: https://github.com/hzeller/gmrender-resurrect
168168
Vcs-Git: https://github.com/hzeller/gmrender-resurrect.git
169169
Vcs-Browser: https://github.com/hzeller/gmrender-resurrect
170170
Description: Minimalist UPNP AV renderer
171-
gmrender-resurrect is a minimalist UPNP AV renderer that can be used to
171+
gmrender-resurrect is a minimalist UPNP AV renderer that can be used to
172172
play music controlled by a UPNP AV control point. This package contains
173173
only a renderer and will therefore require these things to be installed
174174
either on this device or another device on the local network in order to

.build/software/raspberrypi-sys-mods/build.bash

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -35,15 +35,15 @@ License: BSD-3-Clause
3535
without specific prior written permission.
3636
.
3737
THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
38-
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
39-
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
38+
``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
39+
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
4040
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE HOLDERS OR
41-
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
42-
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
43-
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
44-
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
45-
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
46-
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
41+
CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL,
42+
EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
43+
PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
44+
PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
45+
LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
46+
NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
4747
SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
4848
_EOF_
4949

.build/software/shairport-sync/build.bash

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ general =
7676
// mdns_backend = "avahi"; // Run "shairport-sync -h" to get a list of all mdns_backends. The default is the first one.
7777
// interface = "name"; // Use this advanced setting to specify the interface on which Shairport Sync should provide its service. Leave it commented out to get the default, which is to select the interface(s) automatically.
7878
// port = <number>; // Listen for service requests on this port. 5000 for AirPlay 1, 7000 for AirPlay 2
79-
// udp_port_base = 6001; // (AirPlay 1 only) start allocating UDP ports from this port number when needed
79+
// udp_port_base = 6001; // (AirPlay 1 only) start allocating UDP ports from this port number when needed
8080
// udp_port_range = 10; // (AirPlay 1 only) look for free ports in this number of places, starting at the UDP port base. Allow at least 10, though only three are needed in a steady state.
8181
// airplay_device_id_offset = 0; // (AirPlay 2 only) add this to the default airplay_device_id calculated from one of the device's MAC address
8282
// airplay_device_id = 0x<six-digit_hexadecimal_number>L; // (AirPlay 2 only) use this as the airplay_device_id e.g. 0xDCA632D4E8F3L -- remember the "L" at the end as it's a 64-bit quantity!

.conf/dps_119/cava.conf

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,6 @@ source = /tmp/mpd.fifo
112112
# Accepts only non-negative values. 50 means half gravity, 200 means double. Set to 0 to disable "drop off".
113113
; gravity = 100
114114

115-
116115
# In bar height, bars that would have been lower that this will not be drawn.
117116
; ignore = 0
118117

.conf/dpv/protonvpn.template

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,6 @@ auth-user-pass
5050
pull
5151
fast-io
5252

53-
5453
<ca>
5554
-----BEGIN CERTIFICATE-----
5655
MIIFozCCA4ugAwIBAgIBATANBgkqhkiG9w0BAQ0FADBAMQswCQYDVQQGEwJDSDEV

.github/workflows/gogs.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,18 +63,18 @@ jobs:
6363
dist_to_name=([5]='buster' [6]='bullseye' [7]='bookworm')
6464
arch_name=${arch_to_name[$arch]}
6565
dist_name=${dist_to_name[$dist]}
66-
66+
6767
# SSH server and client keys
6868
mkdir ~/.ssh
6969
umask 377
7070
echo '${{ secrets.KNOWN_HOSTS }}' > ~/.ssh/known_hosts
7171
echo '${{ secrets.SSH_KEY }}' > ~/.ssh/id_ed25519
72-
72+
7373
# Upload
7474
curl -T "rootfs/gogs_$arch_name.7z" --key ~/.ssh/id_ed25519 "${{ secrets.UPLOAD_URL }}$dist_name/"
7575
curl 'https://api.cloudflare.com/client/v4/zones/${{ secrets.CF_ZONE }}/purge_cache' -H 'Authorization: Bearer ${{ secrets.CF_TOKEN }}' -H 'Content-Type: application/json' \
7676
--data "{\"files\":[\"https://dietpi.com/downloads/binaries/$dist_name/testing/\",\"https://dietpi.com/downloads/binaries/$dist_name/testing/gogs_$arch_name.7z\"]}"
77-
77+
7878
# Pre-v8.14 ARMv6 zip upload
7979
[ "$arch$dist" = '15' ] || exit 0
8080
curl -T 'rootfs/gogs_armv6.zip' --key ~/.ssh/id_ed25519 '${{ secrets.UPLOAD_URL }}all/'

0 commit comments

Comments
 (0)