From 02d4ef89074305389938fb6e8b4f6975dea30dcf Mon Sep 17 00:00:00 2001 From: Richard Scott Date: Tue, 5 Dec 2023 16:53:04 +0000 Subject: [PATCH] Reverted code changes --- .github/workflows/default_config.yaml | 1 - bin/update.sh | 12 ++--- core | 1 - .../default_config/manifest.json | 53 +------------------ hacs.json | 6 +-- 5 files changed, 5 insertions(+), 68 deletions(-) delete mode 160000 core diff --git a/.github/workflows/default_config.yaml b/.github/workflows/default_config.yaml index 3412962..1cbe9d3 100644 --- a/.github/workflows/default_config.yaml +++ b/.github/workflows/default_config.yaml @@ -26,7 +26,6 @@ jobs: with: ref: ${{ github.head_ref }} path: "clone" - submodules: "recursive" - name: "Checkout Git https://github.com/home-assistant/core/" uses: actions/checkout@v3 diff --git a/bin/update.sh b/bin/update.sh index 20ac58b..a8f6377 100755 --- a/bin/update.sh +++ b/bin/update.sh @@ -24,14 +24,8 @@ if [[ ! -d upstream ]]; then fi -if [[ -d core ]]; then - cd core - git pull --depth 1 - cd "${START_DIR}" -fi - # Create a variable for the source directory we are using. -SRC_DIR="${START_DIR}/core/homeassistant/components/default_config" +SRC_DIR="${START_DIR}/upstream/homeassistant/components/default_config" # Check the source directory exists test -d "${SRC_DIR}" || exit 1 @@ -42,10 +36,10 @@ if [[ ! -d custom_components/default_config ]]; then fi # Check for changed files -if [[ $(rsync -avz --checksum --dry-run ${START_DIR}/upstream/homeassistant/components/default_config ${START_DIR}/core/homeassistant/components | grep -c default_config) -gt 1 ]]; then +if [[ $(rsync -avz --checksum --dry-run ${START_DIR}/upstream/homeassistant/components/default_config ${START_DIR}/custom_components | grep -c default_config) -gt 1 ]]; then # Copy over the upstream files - rsync -avz "${START_DIR}/core/homeassistant/components/default_config" "${START_DIR}/custom_components" + rsync -avz "${START_DIR}/upstream/homeassistant/components/default_config" "${START_DIR}/custom_components" # Add in required data for the component to get loaded cat <<<$(jq ". + { "version": \"${HOME_ASSISTANT_CORE_LATEST_TAG}.1\" }" ${START_DIR}/custom_components/default_config/manifest.json) >${START_DIR}/custom_components/default_config/manifest.json diff --git a/core b/core deleted file mode 160000 index a1f7f89..0000000 --- a/core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit a1f7f899c94f3b02baeaeb34bae1c7315338d20c diff --git a/custom_components/default_config/manifest.json b/custom_components/default_config/manifest.json index 148abb9..929ab8c 100644 --- a/custom_components/default_config/manifest.json +++ b/custom_components/default_config/manifest.json @@ -1,52 +1 @@ -{ - "domain": "default_config", - "name": "Default Config", - "codeowners": [ - "@home-assistant/core" - ], - "dependencies": [ - "application_credentials", - "assist_pipeline", - "automation", - "bluetooth", - "conversation", - "counter", - "dhcp", - "energy", - "frontend", - "hardware", - "history", - "homeassistant_alerts", - "input_boolean", - "input_button", - "input_datetime", - "input_number", - "input_select", - "input_text", - "logbook", - "logger", - "map", - "media_source", - "mobile_app", - "my", - "network", - "person", - "scene", - "schedule", - "script", - "ssdp", - "stream", - "sun", - "system_health", - "tag", - "timer", - "usb", - "webhook", - "zeroconf", - "zone" - ], - "documentation": "https://www.home-assistant.io/integrations/default_config", - "integration_type": "system", - "quality_scale": "internal", - "version": "2023.11.3.1" -} +{ "domain": "default_config", "name": "Default Config", "codeowners": [ "@home-assistant/core" ], "dependencies": [ "application_credentials", "assist_pipeline", "automation", "bluetooth", "conversation", "counter", "dhcp", "energy", "frontend", "hardware", "history", "homeassistant_alerts", "input_boolean", "input_button", "input_datetime", "input_number", "input_select", "input_text", "logbook", "logger", "map", "media_source", "mobile_app", "my", "network", "person", "scene", "schedule", "script", "ssdp", "stream", "sun", "system_health", "tag", "timer", "usb", "webhook", "zeroconf", "zone" ], "documentation": "https://www.home-assistant.io/integrations/default_config", "integration_type": "system", "quality_scale": "internal", "version": "2023.11.3.1" } diff --git a/hacs.json b/hacs.json index bba197b..f337952 100644 --- a/hacs.json +++ b/hacs.json @@ -1,5 +1 @@ -{ - "name": "Home Assistant Cloud Hider", - "render_readme": true, - "homeassistant": "2023.11.3" -} +{ "name": "Home Assistant Cloud Hider", "render_readme": true, "homeassistant": "2023.11.3" }