Skip to content

Commit 6fe9127

Browse files
SuyunmengSuyunmeng
committed
fix: Update UPX compression command and improve error messages in install script
1 parent d59b97b commit 6fe9127

4 files changed

Lines changed: 43 additions & 39 deletions

File tree

‎.github/workflows/release-build.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ jobs:
104104
- name: UPX Compress
105105
if: ${{ matrix.arch != 'loongarch64_generic' && matrix.arch != 'mips64_mips64r2' && matrix.arch != 'mips64_octeonplus' && matrix.arch != 'mips64el_mips64r2' && matrix.arch != 'riscv64_riscv64' }}
106106
run: |
107-
sed -i '/INSTALL_DATA/a \\t/usr/bin/upx --lzma --best $(1)\/usr\/bin\/openlist' openlist/Makefile
107+
sed -i '/openlist.init/a \\t/usr/bin/upx --lzma --best $(1)\/usr\/bin\/openlist' openlist/Makefile
108108
109109
- name: Build Packages
110110
uses: OpenListTeam/openwrt-gh-action-sdk@go1.25

‎install.sh‎

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,8 +7,11 @@ RED='\033[1;31m'
77
GREEN='\033[1;32m'
88
RESET='\033[0m'
99

10-
msg_red() { printf "${RED}%s${RESET}\n" "$*"; }
11-
msg_green() { printf "${GREEN}%s${RESET}\n" "$*"; }
10+
msg_red() { printf "${RED}%b${RESET}\n" "$*"; }
11+
msg_green() { printf "${GREEN}%b${RESET}\n" "$*"; }
12+
13+
msg_green "\nInstall OpenList-OpenWRT"
14+
msg_green "LuCI support for OpenList\n"
1215

1316
# Parse gh_proxy from $1 if provided, e.g. gh_proxy="https://gh-proxy.com/"
1417
gh_proxy=""
@@ -27,7 +30,7 @@ fi
2730

2831
# Check if running on OpenWrt
2932
if [ ! -f /etc/openwrt_release ]; then
30-
msg_red "Unknown OpenWrt Version"
33+
msg_red "Unknown OpenWrt Version."
3134
exit 1
3235
fi
3336

@@ -51,14 +54,15 @@ fi
5154

5255
# Check LuCI version compatibility
5356
if [ ! -d "/usr/share/luci/menu.d" ]; then
54-
msg_red "OpenWrt LuCI version is not supported. The minimum required version is openwrt-21.02 or higher."
57+
msg_red "The current OpenWrt LuCI version is not supported or \`luci-base\` is not installed."
58+
msg_red "The minimum required OpenWrt version is openwrt-21.02 or higher."
5559
exit 1
5660
fi
5761

58-
# Check available root partition space (at least 35MB required)
62+
# Check available root partition space (at least 20MiB required)
5963
ROOT_SPACE=$(df -m /usr | awk 'END{print $4}')
60-
if [ "$ROOT_SPACE" -lt 35 ]; then
61-
msg_red "Error: The system storage space is less than 35MB."
64+
if [ "$ROOT_SPACE" -lt 20 ]; then
65+
msg_red "Error: The system storage space is less than 20MiB."
6266
exit 1
6367
fi
6468

@@ -138,7 +142,7 @@ if [ -x "/etc/init.d/openlist" ]; then
138142
fi
139143

140144
# Extract and install packages
141-
msg_green "Installing Packages ..."
145+
msg_green "\nInstalling Packages ..."
142146
tar -zxf "$TEMP_DIR/$PKG_FILE" -C "$TEMP_DIR/"
143147
for pkg in "$TEMP_DIR"/packages_ci/openlist*.* \
144148
"$TEMP_DIR"/packages_ci/luci-app-openlist*.* \

‎luci-app-openlist/htdocs/luci-static/resources/view/openlist/basic.js‎

Lines changed: 18 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,8 @@ return view.extend({
5454
var data_dir = uci.get(data[0], '@openlist[0]', 'data_dir') || '/etc/openlist';
5555
try {
5656
var newpassword = await fs.exec('/usr/bin/openlist', ['admin', 'random', '--data', data_dir]);
57-
var new_password = newpassword.stderr.match(/password:\s*(\S+)/)[1];
57+
var new_password = newpassword.stdout.match(/password:\s*(\S+)/)[1];
58+
5859
const textArea = document.createElement('textarea');
5960
textArea.value = new_password;
6061
document.body.appendChild(textArea);
@@ -220,39 +221,39 @@ return view.extend({
220221
o.value('postgres', _('PostgreSQL'));
221222

222223
o = s.taboption('database', form.Value, 'mysql_host', _('Database Host'));
223-
o.depends('database_type','mysql');
224-
o.depends('database_type','postgres');
224+
o.depends('database_type', 'mysql');
225+
o.depends('database_type', 'postgres');
225226

226227
o = s.taboption('database', form.Value, 'mysql_port', _('Database Port'));
227228
o.datatype = 'port';
228229
o.default = '3306';
229-
o.depends('database_type','mysql');
230-
o.depends('database_type','postgres');
230+
o.depends('database_type', 'mysql');
231+
o.depends('database_type', 'postgres');
231232

232233
o = s.taboption('database', form.Value, 'mysql_username', _('Database Username'));
233-
o.depends('database_type','mysql');
234-
o.depends('database_type','postgres');
234+
o.depends('database_type', 'mysql');
235+
o.depends('database_type', 'postgres');
235236

236237
o = s.taboption('database', form.Value, 'mysql_password', _('Database Password'));
237-
o.depends('database_type','mysql');
238-
o.depends('database_type','postgres');
238+
o.depends('database_type', 'mysql');
239+
o.depends('database_type', 'postgres');
239240

240241
o = s.taboption('database', form.Value, 'mysql_database', _('Database Name'));
241-
o.depends('database_type','mysql');
242-
o.depends('database_type','postgres');
242+
o.depends('database_type', 'mysql');
243+
o.depends('database_type', 'postgres');
243244

244245
o = s.taboption('database', form.Value, 'mysql_table_prefix', _('Database Table Prefix'));
245246
o.default = 'x_';
246-
o.depends('database_type','mysql');
247-
o.depends('database_type','postgres');
247+
o.depends('database_type', 'mysql');
248+
o.depends('database_type', 'postgres');
248249

249250
o = s.taboption('database', form.Value, 'mysql_ssl_mode', _('Database SSL Mode'));
250-
o.depends('database_type','mysql');
251-
o.depends('database_type','postgres');
251+
o.depends('database_type', 'mysql');
252+
o.depends('database_type', 'postgres');
252253

253254
o = s.taboption('database', form.Value, 'mysql_dsn', _('Database DSN'));
254-
o.depends('database_type','mysql');
255-
o.depends('database_type','postgres');
255+
o.depends('database_type', 'mysql');
256+
o.depends('database_type', 'postgres');
256257

257258
// scheme
258259
o = s.taboption('scheme', form.Flag, 'ssl', _('Enable SSL'));

‎openlist/Makefile‎

Lines changed: 12 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@
77
include $(TOPDIR)/rules.mk
88

99
PKG_NAME:=openlist
10-
PKG_VERSION:=4.1.1
11-
PKG_WEB_VERSION:=4.1.1
10+
PKG_VERSION:=4.1.0
11+
PKG_WEB_VERSION:=4.1.0
1212
PKG_RELEASE:=1
1313

1414
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
1515
PKG_SOURCE_URL:=https://codeload.github.com/OpenListTeam/OpenList/tar.gz/v$(PKG_VERSION)?
16-
PKG_HASH:=19233fbe67d848e1212b8c23e8af145b1c23533a2c09fd66c141d2de05b9b15c
16+
PKG_HASH:=cdaf91413fe07b3d8155f644237a839dac09f084e812b25c76effca7dfc1d3f2
1717

1818
PKG_BUILD_DIR:=$(BUILD_DIR)/OpenList-$(PKG_VERSION)
1919

@@ -24,7 +24,7 @@ PKG_MAINTAINER:=OpenList Team <openlistteam@gmail.com>
2424
define Download/openlist-frontend
2525
FILE:=openlist-frontend-dist-v$(PKG_WEB_VERSION).tar.gz
2626
URL:=https://github.com/OpenListTeam/OpenList-Frontend/releases/download/v$(PKG_WEB_VERSION)/
27-
HASH:=4f114ef60c95c9fa5ffc808485fd322305460891476b3248188dc75e0b7a6a6a
27+
HASH:=ddaeb76aad74a858358de9a1e0d1aff93651605859813b0891b9f4f431d1a87f
2828
endef
2929

3030
PKG_BUILD_DEPENDS:=golang/host
@@ -34,12 +34,12 @@ PKG_BUILD_FLAGS:=no-mips16
3434

3535
GO_PKG:=github.com/OpenListTeam/OpenList
3636
GO_PKG_LDFLAGS:= \
37-
-X '$(GO_PKG)/internal/conf.BuiltAt=$(shell date '+%Y-%m-%d %H:%M:%S %z')' \
38-
-X '$(GO_PKG)/internal/conf.GoVersion=$(shell $(STAGING_DIR_HOSTPKG)/bin/go version | sed 's/go version //')' \
39-
-X '$(GO_PKG)/internal/conf.GitAuthor=The OpenList Projects Contributors <noreply@openlist.team>' \
40-
-X '$(GO_PKG)/internal/conf.GitCommit=tarball/$(shell echo $(PKG_HASH) | cut -c 1-7)' \
41-
-X '$(GO_PKG)/internal/conf.Version=v$(PKG_VERSION) (OpenWrt $(ARCH_PACKAGES))' \
42-
-X '$(GO_PKG)/internal/conf.WebVersion=v$(PKG_WEB_VERSION)'
37+
-X '$(GO_PKG)/v4/internal/conf.BuiltAt=$(shell date '+%Y-%m-%d %H:%M:%S %z')' \
38+
-X '$(GO_PKG)/v4/internal/conf.GoVersion=$(shell $(STAGING_DIR_HOSTPKG)/bin/go version | sed 's/go version //')' \
39+
-X '$(GO_PKG)/v4/internal/conf.GitAuthor=The OpenList Projects Contributors <noreply@openlist.team>' \
40+
-X '$(GO_PKG)/v4/internal/conf.GitCommit=tarball/$(shell echo $(PKG_HASH) | cut -c 1-7)' \
41+
-X '$(GO_PKG)/v4/internal/conf.Version=v$(PKG_VERSION) (OpenWrt $(ARCH_PACKAGES))' \
42+
-X '$(GO_PKG)/v4/internal/conf.WebVersion=v$(PKG_WEB_VERSION)'
4343
ifneq ($(CONFIG_ARCH_64BIT),y)
4444
GO_PKG_EXCLUDES:=drivers/lark
4545
endif
@@ -80,9 +80,8 @@ endif
8080
define Build/Prepare
8181
$(call Build/Prepare/Default)
8282
$(TAR) --strip-components=1 -C $(PKG_BUILD_DIR)/public/dist -xzf $(DL_DIR)/openlist-frontend-dist-v$(PKG_WEB_VERSION).tar.gz
83-
$(SED) 's_https://docs.oplist.org/logo.png_/assets/logo.png_g' $(PKG_BUILD_DIR)/public/dist/index.html
84-
$(SED) 's_https://docs.oplist.org/logo.svg_/assets/logo.svg_g' $(PKG_BUILD_DIR)/public/dist/index.html
85-
$(SED) 's_https://docs.oplist.org/logo.png_/assets/logo.png_g' $(PKG_BUILD_DIR)/public/dist/static/manifest.json
83+
$(SED) 's_https://cdn.oplist.org/gh/OpenListTeam/Logo@main_/assets_g' $(PKG_BUILD_DIR)/public/dist/index.html
84+
$(SED) 's_https://docs.oplist.org_/assets_g' $(PKG_BUILD_DIR)/public/dist/static/manifest.json
8685
endef
8786

8887
define Package/openlist/install

0 commit comments

Comments
 (0)