Move scripts

victorpaleologue · Aug 10, 2021 · 583dcd0 · 583dcd0
1 parent f90d2ba
commit 583dcd0
Show file tree

Hide file tree

Showing 12 changed files with 31 additions and 26 deletions.
diff --git a/.github/workflows/continuous.yml b/.github/workflows/continuous.yml
@@ -47,20 +47,20 @@ jobs:
       run: mkdir -p /tmp/workspace
 
     - name: ICU
-      working-directory: scripts/icu
-      run: bash build.sh
+      working-directory: scripts
+      run: bash build_icu.sh
 
     - name: ZLib
-      working-directory: scripts/zlib
-      run: bash build.sh
+      working-directory: scripts
+      run: bash build_zlib.sh
 
     - name: Boost
-      working-directory: scripts/boost
-      run: bash build.sh
+      working-directory: scripts
+      run: bash build_boost.sh
 
     - name: OpenSSL
-      working-directory: scripts/openssl
-      run: bash build.sh
+      working-directory: scripts
+      run: bash build_openssl.sh
 
     - name: Pre-Release Packages
       uses: "marvinpinto/action-automatic-releases@latest"

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -48,20 +48,20 @@ jobs:
       run: mkdir -p /tmp/workspace
 
     - name: ICU
-      working-directory: scripts/icu
-      run: bash build.sh
+      working-directory: scripts
+      run: bash build_icu.sh
 
     - name: ZLib
-      working-directory: scripts/zlib
-      run: bash build.sh
+      working-directory: scripts
+      run: bash build_zlib.sh
 
     - name: Boost
-      working-directory: scripts/boost
-      run: bash build.sh
+      working-directory: scripts
+      run: bash build_boost.sh
 
     - name: OpenSSL
-      working-directory: scripts/openssl
-      run: bash build.sh
+      working-directory: scripts
+      run: bash build_openssl.sh
 
     - name: Release Packages
       uses: "marvinpinto/action-automatic-releases@latest"

diff --git a/scripts/boost/build.sh → scripts/build_boost.sh b/scripts/boost/build.sh → scripts/build_boost.sh
@@ -33,7 +33,7 @@ function build_and_install()
 curl -L -v "${PKG_URL}" | tar -C ${EXTRACT_DIR}/ -xz
 cd ${EXTRACT_DIR}/boost_1_${LIB_VER}_0/
 build_and_install ${INSTALL_DIR}
-sudo echo "${LIB_VER}" >> ${INSTALL_DIR}/VERSION
+sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 # install on the system for the next tasks
 build_and_install

diff --git a/scripts/eigen3/build.sh → scripts/build_eigen3.sh b/scripts/eigen3/build.sh → scripts/build_eigen3.sh
@@ -26,8 +26,7 @@ function build_and_install()
 git clone ${GIT_URL} ${EXTRACT_DIR} -b ${LIB_VER}
 cd ${EXTRACT_DIR}
 build_and_install ${INSTALL_DIR}
-sudo echo "${LIB_VER}" >> ${INSTALL_DIR}/VERSION
-
+sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 # install on the system for the next tasks
 build_and_install

diff --git a/scripts/icu/build.sh → scripts/build_icu.sh b/scripts/icu/build.sh → scripts/build_icu.sh
@@ -20,7 +20,7 @@ function build_and_install()
 git clone ${GIT_URL} ${EXTRACT_DIR} -b ${LIB_VER}
 cd ${EXTRACT_DIR}/icu4c/source
 build_and_install ${INSTALL_DIR}
-sudo echo "${LIB_VER}" >> ${INSTALL_DIR}/VERSION
+sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 # install on the system for the next tasks
 build_and_install

diff --git a/scripts/json-nlohmann/build.sh → scripts/build_json-nlohmann.sh b/scripts/json-nlohmann/build.sh → scripts/build_json-nlohmann.sh
@@ -26,7 +26,7 @@ function build_and_install()
 git clone ${GIT_URL} ${EXTRACT_DIR} -b ${LIB_VER}
 cd ${EXTRACT_DIR}
 build_and_install ${INSTALL_DIR}
-sudo echo "${LIB_VER}" >> ${INSTALL_DIR}/VERSION
+sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 # install on the system for the next tasks
 build_and_install

diff --git a/scripts/libusb/build.sh → scripts/build_libusb.sh b/scripts/libusb/build.sh → scripts/build_libusb.sh
@@ -21,7 +21,7 @@ function build_and_install()
 git clone ${GIT_URL} ${EXTRACT_DIR} -b ${LIB_VER}
 cd ${EXTRACT_DIR}
 build_and_install ${INSTALL_DIR}
-sudo echo "${LIB_VER}" >> ${INSTALL_DIR}/VERSION
+sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 # install on the system for the next tasks
 build_and_install

diff --git a/scripts/openssl/build.sh → scripts/build_openssl.sh b/scripts/openssl/build.sh → scripts/build_openssl.sh
@@ -22,7 +22,7 @@ function build_and_install()
 git clone ${GIT_URL} ${EXTRACT_DIR} -b ${LIB_VER}
 cd ${EXTRACT_DIR}
 build_and_install ${INSTALL_DIR}
-sudo echo "${LIB_VER}" >> ${INSTALL_DIR}/VERSION
+sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 # install on the system for the next tasks
 build_and_install

diff --git a/scripts/sqlite3/build.sh → scripts/build_sqlite3.sh b/scripts/sqlite3/build.sh → scripts/build_sqlite3.sh
@@ -20,7 +20,7 @@ function build_and_install()
 mkdir -p "${EXTRACT_DIR}" && cd "${EXTRACT_DIR}"
 wget "${PKG_URL}" && tar -xf "sqlite-autoconf-${LIB_VER}.tar.gz" && cd "sqlite-autoconf-${LIB_VER}"
 build_and_install ${INSTALL_DIR}
-sudo echo "${LIB_VER}" >> ${INSTALL_DIR}/VERSION
+sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 # install on the system for the next tasks
 build_and_install

diff --git a/scripts/tinyxml/build.sh → scripts/build_tinyxml.sh b/scripts/tinyxml/build.sh → scripts/build_tinyxml.sh
@@ -26,7 +26,7 @@ function build_and_install()
 git clone ${GIT_URL} ${EXTRACT_DIR} -b ${LIB_VER}
 cd ${EXTRACT_DIR}
 build_and_install ${INSTALL_DIR}
-sudo echo "${LIB_VER}" >> ${INSTALL_DIR}/VERSION
+sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 # install on the system for the next tasks
 build_and_install

diff --git a/scripts/zlib/build.sh → scripts/build_zlib.sh b/scripts/zlib/build.sh → scripts/build_zlib.sh
@@ -20,7 +20,7 @@ function build_and_install()
 git clone ${GIT_URL} ${EXTRACT_DIR} -b ${LIB_VER}
 cd ${EXTRACT_DIR}
 build_and_install ${INSTALL_DIR}
-echo "${LIB_VER}" >> ${INSTALL_DIR}/VERSION
+sudo echo '${LIB_VER}' | sudo tee -a ${INSTALL_DIR}/VERSION
 
 # install on the system for the next tasks
 build_and_install

diff --git a/scripts/functions.sh b/scripts/functions.sh
@@ -0,0 +1,6 @@
+function clone_and_cd {
+    git clone ${GIT_URL} ${EXTRACT_DIR} -b ${LIB_VER}
+    cd ${EXTRACT_DIR}
+}
+
+export -f clone_and_cd