浏览代码

Refactor config settings appending method

Replaced the configuration setting loop with a heredoc to append configurations directly to the GKI_DEFCONFIG file.
jimsterino98 2 月之前
父节点
当前提交
213d168948
共有 1 个文件被更改,包括 15 次插入28 次删除
  1. 15 28
      .github/actions/droidspaces/action.yml

+ 15 - 28
.github/actions/droidspaces/action.yml

@@ -20,31 +20,18 @@ runs:
      fi
 
      cd "$GITHUB_WORKSPACE"
-     configs=(
-     "CONFIG_SYSVIPC=y"
-     "CONFIG_POSIX_MQUEUE=y"
-     "CONFIG_IPC_NS=y"
-     "CONFIG_PID_NS=y"
-     "CONFIG_DEVTMPFS=y"
-     "CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y"
-     "CONFIG_NETFILTER_XT_TARGET_REJECT=y"
-     "CONFIG_NETFILTER_XT_TARGET_LOG=y"
-     "CONFIG_NETFILTER_XT_MATCH_RECENT=y"
-     "CONFIG_IP_SET=y"
-     "CONFIG_IP_SET_HASH_IP=y"
-     "CONFIG_IP_SET_HASH_NET=y"
-     "CONFIG_NETFILTER_XT_SET=y"
-     )
-     
-     for config in "${configs[@]}"; do
-         key="${config%%=*}"
-
-         if grep -qE "^(${key}=|# ${key} is not set$)" "$GKI_DEFCONFIG"; then
-             sed -i -E \
-                 -e "s/^${key}=.*/${config}/" \
-                 -e "s/^# ${key} is not set\$/${config}/" \
-                 "$GKI_DEFCONFIG"
-         else
-             echo "$config" >> "$GKI_DEFCONFIG"
-         fi
-     done
+     cat << "$GKI_DEFCONFIG" >> EOF
+     CONFIG_SYSVIPC=y
+     CONFIG_POSIX_MQUEUE=y
+     CONFIG_IPC_NS=y
+     CONFIG_PID_NS=y
+     CONFIG_DEVTMPFS=y
+     CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=y
+     CONFIG_NETFILTER_XT_TARGET_REJECT=y
+     CONFIG_NETFILTER_XT_TARGET_LOG=y
+     CONFIG_NETFILTER_XT_MATCH_RECENT=y
+     CONFIG_IP_SET=y
+     CONFIG_IP_SET_HASH_IP=y
+     CONFIG_IP_SET_HASH_NET=y
+     CONFIG_NETFILTER_XT_SET=y
+     EOF