diff --git a/.github/workflows/issues.yml b/.github/workflows/issues.yml index bef78a61..79e6c3fb 100644 --- a/.github/workflows/issues.yml +++ b/.github/workflows/issues.yml @@ -261,8 +261,16 @@ jobs: echo "set addons: ${{ env.addons }}" USER_CONFIG_FILE="rr/ws/mnt/p1/user-config.yml" writeConfigKey "addons" "{}" "${USER_CONFIG_FILE}" - for A in $(echo "${{ env.addons }}" | sed 's/,/ /g'); do - writeConfigKey "addons.\"${A}\"" "" "${USER_CONFIG_FILE}" + IFS=',' read -ra ADDON_ARR <<< "${{ env.addons }}" + for A in "${ADDON_ARR[@]}"; do + if echo "${A}" | grep -qE '^[^:]+:[^:]+$'; then + KEY="$(echo "${A}" | cut -d':' -f1 | xargs)" + VAL="$(echo "${A}" | cut -d':' -f2 | xargs)" + else + KEY="${A}" + VAL="" + fi + writeConfigKey "addons.\"${KEY}\"" "${VAL}" "${USER_CONFIG_FILE}" done fi diff --git a/docs/issues.html b/docs/issues.html index 0dce40d5..496a1493 100644 --- a/docs/issues.html +++ b/docs/issues.html @@ -157,7 +157,7 @@ if (extstr.includes(ext)) { par = "btn-danger"; } - html += ` `; + html += ` `; //if (idx++ % 10 == 0) html += "
"; } html += ``; @@ -180,7 +180,7 @@ for (var ext in _modules[platform]) { extstr.push(ext); var par = "btn-danger"; - html += ` `; + html += ` `; //if (idx++ % 10 == 0) html += "
"; } html += ``; @@ -207,9 +207,36 @@ } } - function onclickext(type, ext) { + function onclickextAddon(ext) { var btnobj = $("#btn_" + ext); - var extstr = $('#' + type).val().split(","); + var extstr = $('#addons').val().split(","); + if (btnobj.hasClass("btn-danger")) { + extstr.map((val, i) => { + if (val.split(':')[0] === ext) { + extstr.splice(i, 1); + } + }); + btnobj.removeClass("btn-danger"); + } else { + btnobj.addClass("btn-danger"); + var param = window.prompt("Please enter parameters (optional):", ""); + if (param !== null && param.trim() !== "") { + extstr.push(ext + ":" + param.trim()); + } else { + extstr.push(ext); + } + } + extstr.map((val, i) => { + if (val === "") { + extstr.splice(i, 1); + } + }); + $('#addons').val(extstr.join(",")); + } + + function onclickextModule(ext) { + var btnobj = $("#btn_" + ext); + var extstr = $('#modules').val().split(","); if (btnobj.hasClass("btn-danger")) { extstr.map((val, i) => { if (val === ext) { @@ -226,7 +253,7 @@ extstr.splice(i, 1); } }); - $('#' + type).val(extstr.join(",")); + $('#modules').val(extstr.join(",")); } function createIssues() { var form = document.getElementById("inputs");