Skip to content

Commit ed88344

Browse files
author
Anton Hurlenko
committed
Use GITHUB_OUTPUT to share variables across steps
1 parent 4ad1f4e commit ed88344

File tree

2 files changed

+15
-13
lines changed

2 files changed

+15
-13
lines changed

.github/workflows/dockerimage.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ jobs:
1616
sudo apt-get update && sudo apt-get install jq -y
1717
THIS_REPO=https://api.github.com/repos/$GITHUB_REPOSITORY/releases/latest
1818
TARGET_REPO=https://api.github.com/repos/filebrowser/filebrowser/releases/latest
19-
echo "current=$(curl $THIS_REPO | jq -r '.tag_name')" >> $GITHUB_STATE
20-
echo "target=$(curl $TARGET_REPO | jq -r '.tag_name')" >> $GITHUB_STATE
19+
echo "current=$(curl $THIS_REPO | jq -r '.tag_name')" >> $GITHUB_OUTPUT
20+
echo "target=$(curl $TARGET_REPO | jq -r '.tag_name')" >> $GITHUB_OUTPUT
2121
id: releases
2222

2323
- name: Install Docker CE

get.sh

Lines changed: 13 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,9 @@
99
# This script installs File Browser to your path.
1010
# Usage:
1111
#
12-
# $ curl -fsSL https://filebrowser.xyz/get.sh | bash
12+
# $ curl -fsSL https://raw.githubusercontent.com/filebrowser/get/master/get.sh | bash
1313
# or
14-
# $ wget -qO- https://filebrowser.xyz/get.sh | bash
14+
# $ wget -qO- https://raw.githubusercontent.com/filebrowser/get/master/get.sh | bash
1515
#
1616
# In automated environments, you may want to run as root.
1717
# If using curl, we recommend using the -fsSL flags.
@@ -97,22 +97,24 @@ install_filemanager()
9797
########################
9898

9999
echo "Downloading File Browser for $filemanager_os/$filemanager_arch..."
100+
if type -p curl >/dev/null 2>&1; then
101+
net_getter="curl -fsSL"
102+
elif type -p wget >/dev/null 2>&1; then
103+
net_getter="wget -qO-"
104+
else
105+
echo "Aborted, could not find curl or wget"
106+
return 7
107+
fi
108+
100109
filemanager_file="${filemanager_os}-$filemanager_arch-filebrowser$filemanager_dl_ext"
101-
# filemanager_tag="$(curl -s https://api.github.com/repos/filebrowser/filebrowser/releases/latest | grep -o '"tag_name": ".*"' | sed 's/"//g' | sed 's/tag_name: //g')"
110+
# filemanager_tag="$(${net_getter} https://api.github.com/repos/filebrowser/filebrowser/releases/latest | grep -o '"tag_name": ".*"' | sed 's/"//g' | sed 's/tag_name: //g')"
102111
filemanager_url="https://github.com/filebrowser/filebrowser/releases/download/$filemanager_tag/$filemanager_file"
103112
echo "$filemanager_url"
104113

105114
# Use $PREFIX for compatibility with Termux on Android
106115
rm -rf "$PREFIX/tmp/$filemanager_file"
107116

108-
if type -p curl >/dev/null 2>&1; then
109-
curl -fsSL "$filemanager_url" -o "$PREFIX/tmp/$filemanager_file"
110-
elif type -p wget >/dev/null 2>&1; then
111-
wget --quiet "$filemanager_url" -O "$PREFIX/tmp/$filemanager_file"
112-
else
113-
echo "Aborted, could not find curl or wget"
114-
return 7
115-
fi
117+
${net_getter} "$filemanager_url" > "$PREFIX/tmp/$filemanager_file"
116118

117119
echo "Extracting..."
118120
case "$filemanager_file" in

0 commit comments

Comments
 (0)