main: consolidate integrated changes after v0.1.54
This commit is contained in:
@@ -21,8 +21,20 @@ fi
|
||||
|
||||
mkdir -p "${REPO_DIR}"
|
||||
|
||||
read -r ADDON_ID ADDON_VERSION < <(python3 - "${PLUGIN_ADDON_XML}" <<'PY'
|
||||
import sys
|
||||
import xml.etree.ElementTree as ET
|
||||
|
||||
root = ET.parse(sys.argv[1]).getroot()
|
||||
print(root.attrib.get("id", "plugin.video.viewit"), root.attrib.get("version", "0.0.0"))
|
||||
PY
|
||||
)
|
||||
|
||||
PLUGIN_ZIP="$("${ROOT_DIR}/scripts/build_kodi_zip.sh")"
|
||||
cp -f "${PLUGIN_ZIP}" "${REPO_DIR}/"
|
||||
PLUGIN_ZIP_NAME="$(basename "${PLUGIN_ZIP}")"
|
||||
PLUGIN_ADDON_DIR_IN_REPO="${REPO_DIR}/${ADDON_ID}"
|
||||
mkdir -p "${PLUGIN_ADDON_DIR_IN_REPO}"
|
||||
cp -f "${PLUGIN_ZIP}" "${PLUGIN_ADDON_DIR_IN_REPO}/${PLUGIN_ZIP_NAME}"
|
||||
|
||||
read -r REPO_ADDON_ID REPO_ADDON_VERSION < <(python3 - "${REPO_ADDON_XML}" <<'PY'
|
||||
import sys
|
||||
@@ -73,7 +85,10 @@ PY
|
||||
REPO_ZIP_NAME="${REPO_ADDON_ID}-${REPO_ADDON_VERSION}.zip"
|
||||
REPO_ZIP_PATH="${REPO_DIR}/${REPO_ZIP_NAME}"
|
||||
rm -f "${REPO_ZIP_PATH}"
|
||||
(cd "${TMP_DIR}" && zip -r "${REPO_ZIP_PATH}" "${REPO_ADDON_ID}" >/dev/null)
|
||||
python3 "${ROOT_DIR}/scripts/zip_deterministic.py" "${REPO_ZIP_PATH}" "${TMP_REPO_ADDON_DIR}" >/dev/null
|
||||
REPO_ADDON_DIR_IN_REPO="${REPO_DIR}/${REPO_ADDON_ID}"
|
||||
mkdir -p "${REPO_ADDON_DIR_IN_REPO}"
|
||||
cp -f "${REPO_ZIP_PATH}" "${REPO_ADDON_DIR_IN_REPO}/${REPO_ZIP_NAME}"
|
||||
|
||||
python3 - "${PLUGIN_ADDON_XML}" "${TMP_REPO_ADDON_DIR}/addon.xml" "${REPO_DIR}/addons.xml" <<'PY'
|
||||
import sys
|
||||
@@ -107,4 +122,5 @@ echo "Repo built:"
|
||||
echo " ${REPO_DIR}/addons.xml"
|
||||
echo " ${REPO_DIR}/addons.xml.md5"
|
||||
echo " ${REPO_ZIP_PATH}"
|
||||
echo " ${REPO_DIR}/$(basename "${PLUGIN_ZIP}")"
|
||||
echo " ${PLUGIN_ADDON_DIR_IN_REPO}/${PLUGIN_ZIP_NAME}"
|
||||
echo " ${REPO_ADDON_DIR_IN_REPO}/${REPO_ZIP_NAME}"
|
||||
|
||||
Reference in New Issue
Block a user