💐 Sync 2026-03-10 20:23:29

luci-app-partexp/Makefile

@@ -11,7 +11,7 @@ LUCI_TITLE:=LuCI Support for Automatic Partition Mount
 LUCI_PKGARCH:=all
 LUCI_DEPENDS:=+fdisk +block-mount +bc +blkid +parted +btrfs-progs +losetup +resize2fs +e2fsprogs +f2fs-tools +kmod-loop
 PKG_VERSION:=2.0.3
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_LICENSE:=Apache-2.0
 PKG_MAINTAINER:=Sirpdboy <herboy2008@gmail.com>

luci-app-partexp/root/usr/bin/partexp

@@ -1,7 +1,7 @@
 #!/bin/sh
 
 #
-# Copyright (C) 2021-2025  sirpdboy  <herboy2008@gmail.com> https://github.com/sirpdboy/luci-app-partexp
+# Copyright (C) 2021-2026  sirpdboy  <herboy2008@gmail.com> https://github.com/sirpdboy/luci-app-partexp
 #
 # This is free software, licensed under the Apache License, Version 2.0 .
 #
@@ -279,8 +279,8 @@ check_part_space() {
 check_free_space() {
     DISK=$1 
     PARTED_OUTPUT=$(parted -s /dev/$DISK unit GB print free 2>/dev/null)
-    FREE_SPACE=$(echo "$PARTED_OUTPUT" | grep "Free Space" | awk '{print $3}' )
-    echo $FREE_SPACE |awk -F '.' '{print $1}' | sed 's/[A-Za-z]//g'
+    FREE_SPACE=$(echo "$PARTED_OUTPUT" | awk '/Free Space/ {last=$3} END {print last}' | sed 's/GB$//')
+    echo $FREE_SPACE | cut -d'.' -f1
 }
 
 show_partition_info() {
@@ -418,12 +418,6 @@ rootfs_resize() {
     fi
 }
 
-get_config() {
-    config_get target_function $1 target_function 1
-    config_get target_disk $1 target_disk 1
-    config_get_bool keep_config $1 keep_config 1
-    config_get format_type $1 format_type
-}
 
 # 修改 fdiskB 函数，使用环境变量参数
 fdiskB() {