Fix lingering issues from directory move

Expunge unsupported installers
thechrisde · Nov 10, 2020 · 1ba5c39 · 1ba5c39
1 parent bbf50ba
commit 1ba5c39
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 621 deletions.
diff --git a/.build/Dockerfile b/.build/Dockerfile
@@ -14,7 +14,7 @@ RUN chmod +x ./select.sh && \
 
 # ============================ Actual image from here ====================
 FROM debian:stable-slim
-WORKDIR /opt/hue-emulator
+WORKDIR /diyhue
 ARG TARGETPLATFORM
 
 COPY requirements.txt ./

diff --git a/.travis.yml → .build/archive/.travis.yml b/.travis.yml → .build/archive/.travis.yml
diff --git a/.build/startup.sh → .build/archive/startup.sh b/.build/startup.sh → .build/archive/startup.sh
diff --git a/.devcontainer/Dockerfile b/.devcontainer/Dockerfile
@@ -1,5 +1,5 @@
 FROM debian:stable-slim as prod
-WORKDIR /opt/hue-emulator
+WORKDIR /diyhue
 
 COPY requirements.txt /tmp/pip-tmp/
 

diff --git a/.devcontainer/docker-compose.yml b/.devcontainer/docker-compose.yml
@@ -28,7 +28,7 @@ services:
     volumes:
       # Update this to wherever you want VS Code to mount the folder of your project
       - ..:/workspace
-      - ../BridgeEmulator:/opt/hue-emulator
+      - ../../src/core:/diyhue
 
       # Uncomment the next line to use Docker from inside the container. See https://aka.ms/vscode-remote/samples/docker-from-docker-compose for details.
       # - /var/run/docker.sock:/var/run/docker.sock 

diff --git a/.github/workflows/docker-release.yml b/.github/workflows/docker-release.yml
@@ -71,7 +71,7 @@ jobs:
       - name: Run docker image
         if: success()
         run: |
-          docker run -d --name diyhue --network=host -v /mnt/hue-emulator/config:/opt/hue-emulator/config -e MAC=b8:27:eb:d4:dc:11 -e IP=192.168.1.123 -e DECONZ=192.168.1.111 -e IP_RANGE=5,6 -e DEBUG=true diyhue/diyhue:ci
+          docker run -d --name diyhue --network=host -v /mnt/hue-emulator/config:/config -e MAC=b8:27:eb:d4:dc:11 -e IP=192.168.1.123 -e DECONZ=192.168.1.111 -e IP_RANGE=5,6 -e DEBUG=true diyhue/diyhue:ci
           sleep 15
           docker logs diyhue
 

diff --git a/.github/workflows/pull-request.yml b/.github/workflows/pull-request.yml
@@ -24,7 +24,7 @@ jobs:
 
       - name: Run docker image
         run: |
-          docker run -d --name diyHue --network=host -v /mnt/hue-emulator/config:/opt/hue-emulator/config -e MAC=b8:27:eb:d4:dc:11 -e IP=192.168.1.123 -e DECONZ=192.168.1.111 -e IP_RANGE=5,6 -e DEBUG=true diyhue/core:ci
+          docker run -d --name diyHue --network=host -v /mnt/hue-emulator/config:/config -e MAC=b8:27:eb:d4:dc:11 -e IP=192.168.1.123 -e DECONZ=192.168.1.111 -e IP_RANGE=5,6 -e DEBUG=true diyhue/core:ci
           sleep 15
           docker logs diyHue
 

diff --git a/.idea/docker/Dockerfile b/.idea/docker/Dockerfile
diff --git a/.idea/docker/docker-compose.yml b/.idea/docker/docker-compose.yml
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -8,7 +8,7 @@
             "name": "Launch diyHue",
             "type": "python",
             "request": "launch",
-            "program": "/opt/hue-emulator/HueEmulator3.py",
+            "program": "/diyhue/main.py",
             "args" : [],
             "pythonPath": "/usr/bin/python3",
             "console": "integratedTerminal"

diff --git a/Installers/OpenWrt/Readme_OpenWrt.md b/Installers/OpenWrt/Readme_OpenWrt.md
diff --git a/Installers/OpenWrt/compiler-entertainment-openwrt.sh b/Installers/OpenWrt/compiler-entertainment-openwrt.sh
diff --git a/Installers/OpenWrt/easy_openwrt.sh b/Installers/OpenWrt/easy_openwrt.sh
diff --git a/Installers/OpenWrt/entertainment-openwrt-aarch64 b/Installers/OpenWrt/entertainment-openwrt-aarch64
diff --git a/Installers/OpenWrt/entertainment-openwrt-armv7l b/Installers/OpenWrt/entertainment-openwrt-armv7l
diff --git a/Installers/OpenWrt/entertainment-openwrt-i686 b/Installers/OpenWrt/entertainment-openwrt-i686
diff --git a/Installers/OpenWrt/entertainment-openwrt-mips b/Installers/OpenWrt/entertainment-openwrt-mips
diff --git a/Installers/OpenWrt/entertainment-openwrt-x86_64 b/Installers/OpenWrt/entertainment-openwrt-x86_64
diff --git a/Installers/OpenWrt/hueemulatorWrt-service b/Installers/OpenWrt/hueemulatorWrt-service
diff --git a/Installers/OpenWrt/install_openwrt.sh b/Installers/OpenWrt/install_openwrt.sh
diff --git a/Installers/OpenWrt/network_OpenWrt.py b/Installers/OpenWrt/network_OpenWrt.py