Skip to content

Commit 76be526

Browse files
committed
Build: Update scripts/dist/install-s6.sh
Signed-off-by: Michael Mayer <michael@photoprism.app>
1 parent 97e6e83 commit 76be526

File tree

11 files changed

+15
-13
lines changed

11 files changed

+15
-13
lines changed

scripts/dist/build-libheif.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fi
1515

1616
CURRENT_DIR=$(pwd)
1717

18-
# Determine the system architecture.
18+
# Determine target architecture.
1919
if [[ $PHOTOPRISM_ARCH ]]; then
2020
SYSTEM_ARCH=$PHOTOPRISM_ARCH
2121
else

scripts/dist/install-chrome.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [[ $(id -u) != "0" ]]; then
1111
exit 1
1212
fi
1313

14-
# Determine the system architecture.
14+
# Determine target architecture.
1515
if [[ $PHOTOPRISM_ARCH ]]; then
1616
SYSTEM_ARCH=$PHOTOPRISM_ARCH
1717
else

scripts/dist/install-darktable.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [[ $(id -u) != "0" ]]; then
1111
exit 1
1212
fi
1313

14-
# Determine the system architecture.
14+
# Determine target architecture.
1515
if [[ $PHOTOPRISM_ARCH ]]; then
1616
SYSTEM_ARCH=$PHOTOPRISM_ARCH
1717
else

scripts/dist/install-ffmpeg.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ DESTDIR=$(realpath "${1:-/opt/ffmpeg}")
1818
# In addition, you can specify a custom version as the second argument.
1919
FFMPEG_VERSION=${2:-release}
2020

21-
# Determine the system architecture.
21+
# Determine target architecture.
2222
if [[ $PHOTOPRISM_ARCH ]]; then
2323
SYSTEM_ARCH=$PHOTOPRISM_ARCH
2424
else

scripts/dist/install-go-tools.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ then
1717
exit 1
1818
fi
1919

20-
# Determine the system architecture.
20+
# Determine target architecture.
2121
if [[ $PHOTOPRISM_ARCH ]]; then
2222
SYSTEM_ARCH=$PHOTOPRISM_ARCH
2323
else

scripts/dist/install-gpu.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ fi
1313

1414
set -e
1515

16-
# Determine the system architecture.
16+
# Determine target architecture.
1717
if [[ $PHOTOPRISM_ARCH ]]; then
1818
SYSTEM_ARCH=$PHOTOPRISM_ARCH
1919
else

scripts/dist/install-jxl.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ if [[ $(id -u) != "0" ]]; then
1111
exit 1
1212
fi
1313

14-
# Determine the system architecture.
14+
# Determine target architecture.
1515
if [[ $PHOTOPRISM_ARCH ]]; then
1616
SYSTEM_ARCH=$PHOTOPRISM_ARCH
1717
else

scripts/dist/install-libheif.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ DESTDIR=$(realpath "${1:-/usr/local}")
1717
# In addition, you can specify a custom version to be installed as the second argument.
1818
LIBHEIF_VERSION=${2:-v1.19.5}
1919

20-
# Determine the system architecture.
20+
# Determine target architecture.
2121
if [[ $PHOTOPRISM_ARCH ]]; then
2222
SYSTEM_ARCH=$PHOTOPRISM_ARCH
2323
else

scripts/dist/install-mariadb.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ set -e
1515

1616
. /etc/os-release
1717

18-
# Determine the system architecture.
18+
# Determine target architecture.
1919
if [[ $PHOTOPRISM_ARCH ]]; then
2020
SYSTEM_ARCH=$PHOTOPRISM_ARCH
2121
else

scripts/dist/install-s6.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ fi
2424
# You can provide a custom installation directory as the first argument.
2525
S6_OVERLAY_DESTDIR=$(realpath "${2:-/}")
2626

27-
# Determine the system architecture.
27+
# Determine target architecture.
2828
if [[ $PHOTOPRISM_ARCH ]]; then
2929
SYSTEM_ARCH=$PHOTOPRISM_ARCH
3030
else
@@ -71,12 +71,14 @@ echo "BINARY URL: ${S6_ARCH_URL}"
7171
echo "NOARCH URL: ${S6_NOARCH_URL}"
7272
echo "------------------------------------------------"
7373

74-
echo "Extracting \"$S6_ARCH_URL\" to \"$S6_OVERLAY_DESTDIR\"."
74+
# Create the destination directory if it does not already exist.
7575
mkdir -p "${S6_OVERLAY_DESTDIR}"
76+
77+
# Download and install the s6-overlay release from GitHub.
78+
echo "Extracting \"$S6_ARCH_URL\" to \"$S6_OVERLAY_DESTDIR\"."
7679
curl -fsSL "$S6_ARCH_URL" | tar -C "${S6_OVERLAY_DESTDIR}" -Jxp
7780

7881
echo "Extracting \"$S6_NOARCH_URL\" to \"$S6_OVERLAY_DESTDIR\"."
79-
mkdir -p "${S6_OVERLAY_DESTDIR}"
8082
curl -fsSL "$S6_NOARCH_URL" | tar -C "${S6_OVERLAY_DESTDIR}" -Jxp
8183

8284
echo "Done."

0 commit comments

Comments
 (0)