From 1b2edc64defa33a45d70aaf1d7052e0928218b45 Mon Sep 17 00:00:00 2001
From: zeus <rootapostolos@swarmlab.io>
Date: Fri, 12 Nov 2021 16:12:43 +0200
Subject: [PATCH] add setup.sh

---
 Dockerfile                                 | 3 ---
 opencv4nodejs_webcam/install-npm-opencv.sh | 4 ++--
 2 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index de2252e..54b3541 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,9 +16,6 @@ ENV GID=23456
 RUN addgroup -S node \
    && adduser -D -g "" -h "/home/${USERhome}" -G "${USERhome}" -u "${UID}" "${USERhome}"
 
-
-
-
 COPY \
   setup.sh \
   extrapackages \
diff --git a/opencv4nodejs_webcam/install-npm-opencv.sh b/opencv4nodejs_webcam/install-npm-opencv.sh
index 454efdc..37a567a 100755
--- a/opencv4nodejs_webcam/install-npm-opencv.sh
+++ b/opencv4nodejs_webcam/install-npm-opencv.sh
@@ -3,7 +3,7 @@
 cd /
 mkdir /opencv \
     && mv /home/${USER1}/${NODEPROJECT}/dlib-master.zip /dlib.zip \
-    && mv /home/${USER1}/${NODEPROJECT}/opencv.zip /home/${USER1}/${NODEPROJECT}/opencv_contrib.zip /opencv \
+    && mv /home/${USER1}/${NODEPROJECT}/opencv-4.x.zip /home/${USER1}/${NODEPROJECT}/opencv_contrib.zip /opencv \
     && cd /opencv \
     && unzip -qq opencv.zip \
     && mv opencv-${OPENCV_VERSION} opencv \
@@ -85,6 +85,6 @@ cp /dlib/dlib/*.txt $LIB_PREFIX/include/dlib/ \
 
 apk del .build-dependencies 
 apk add -u --no-cache $RUNTIME_DEPS 
-rm -rf /home/${USER1}/${NODEPROJECT}/opencv.zip /home/${USER1}/${NODEPROJECT}/opencv_contrib.zip /home/${USER1}/${NODEPROJECT}/dlib-master.zip 
+rm -rf /home/${USER1}/${NODEPROJECT}/opencv-4.x.zip /home/${USER1}/${NODEPROJECT}/opencv_contrib.zip /home/${USER1}/${NODEPROJECT}/dlib-master.zip 
 rm -rf /var/cache/apk/* /usr/share/man /usr/local/share/man /tmp/*