From 995b93cf30756eb9c2e20d1e244fbbf22a3e16d0 Mon Sep 17 00:00:00 2001
From: Fabio Belavenuto <belavenuto@gmail.com>
Date: Sat, 2 Jul 2022 15:26:34 -0300
Subject: [PATCH] Organizing for actions

---
 addons            |  1 -
 img-gen.sh        | 19 +++++++++++++++++++
 install-addons.sh | 14 --------------
 3 files changed, 19 insertions(+), 15 deletions(-)
 delete mode 160000 addons
 delete mode 100755 install-addons.sh

diff --git a/addons b/addons
deleted file mode 160000
index 11c4352a..00000000
--- a/addons
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 11c4352a906678fcc6a861b598dacf97a1a223f9
diff --git a/img-gen.sh b/img-gen.sh
index ffdc7e2f..89d34905 100755
--- a/img-gen.sh
+++ b/img-gen.sh
@@ -15,12 +15,31 @@ rm -rf "${BR_VER}/output/target/opt/arpl"
 rm -rf "${BR_VER}/board/arpl/overlayfs"
 rm -rf "${BR_VER}/board/arpl/p1"
 rm -rf "${BR_VER}/board/arpl/p3"
+
 # Get latest LKMs
 echo "Getting latest LKMs"
 TAG=`curl -s https://api.github.com/repos/fbelavenuto/redpill-lkm/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
 curl -L "https://github.com/fbelavenuto/redpill-lkm/releases/download/${TAG}/rp-lkms.zip" -o /tmp/rp-lkms.zip
 rm -rf files/board/arpl/p3/lkms/*
 unzip /tmp/rp-lkms.zip -d files/board/arpl/p3/lkms
+
+# Get latest addons and install its
+echo "Getting latest Addons"
+TAG=`curl -s https://api.github.com/repos/fbelavenuto/arpl-addons/releases/latest | grep "tag_name" | awk '{print substr($2, 2, length($2)-3)}'`
+curl -L "https://github.com/fbelavenuto/arpl-addons/releases/download/${TAG}/addons.zip" -o /tmp/addons.zip
+rm -rf addons
+mkdir -p addons
+unzip /tmp/addons.zip -d addons
+DEST_PATH="files/board/arpl/p3/addons"
+echo "Installing addons to ${DEST_PATH}"
+for PKG in `ls addons/*.addon`; do
+  ADDON=`basename ${PKG} | sed 's|.addon||'`
+  mkdir -p "${DEST_PATH}/${ADDON}"
+  echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}"
+  tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}"
+done
+
+# Copy files
 echo "Copying files"
 cp -Ru files/* "${BR_VER}/"
 VERSION=`cat VERSION`
diff --git a/install-addons.sh b/install-addons.sh
deleted file mode 100755
index 534f8b17..00000000
--- a/install-addons.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-set -e
-
-SRC_PATH="addons"
-DEST_PATH="files/board/arpl/p3/addons"
-
-echo "Installing addons to ${DEST_PATH}"
-for PKG in `ls ${SRC_PATH}/*.addon`; do
-  ADDON=`basename ${PKG} | sed 's|.addon||'`
-  mkdir -p "${DEST_PATH}/${ADDON}"
-  echo "Extracting ${PKG} to ${DEST_PATH}/${ADDON}"
-  tar xaf "${PKG}" -C "${DEST_PATH}/${ADDON}"
-done