From e80a455f44521966461dd299493605ee8b53bb38 Mon Sep 17 00:00:00 2001 From: Mathieu ROUDAUT Date: Mon, 27 Mar 2023 10:42:40 +0200 Subject: [PATCH] feat: make scripts portable across unix systems --- backend/geonature/utils/command.py | 6 +++--- data/migrations/2.0.1to2.1.0.sh | 2 +- data/migrations/2.4.0to2.4.1_insert_departments.sh | 4 ++-- data/migrations/missing_grid.sh | 2 +- data/migrations/v1tov2/migratetoV2.sh | 2 +- data/migrations/v1tov2/my_organisme/mymigratetoV2.sh | 2 +- data/migrations/v1tov2/old/v1_compat.sh.old | 2 +- data/scripts/backup/pgdump2ftpbackup.sh | 2 +- data/scripts/import_ginco/import_ca.sh | 2 +- data/scripts/import_ginco/import_mtd.sh | 2 +- .../import_ginco/import_taxref/import_new_taxref_version.sh | 2 +- data/scripts/import_ginco/restore_db.sh | 2 +- data/scripts/ref_geo/insert_reg.sh | 4 ++-- data/scripts/sensi/import_sensi_depobio.sh | 2 +- install/00_install_nvm.sh | 2 +- install/01_install_backend.sh | 2 +- install/02_configure_systemd.sh | 2 +- install/03_create_db.sh | 2 +- install/04_install_gn_modules.sh | 2 +- install/05_install_frontend.sh | 2 +- install/06_configure_apache.sh | 2 +- install/install_all/install_all.sh | 2 +- install/migration/beta4tobeta5.sh | 2 +- install/migration/migration.sh | 2 +- install/utils | 2 +- lint.sh | 2 +- 26 files changed, 30 insertions(+), 30 deletions(-) diff --git a/backend/geonature/utils/command.py b/backend/geonature/utils/command.py index ba7d715af0..661f5c18f5 100644 --- a/backend/geonature/utils/command.py +++ b/backend/geonature/utils/command.py @@ -57,7 +57,7 @@ def create_frontend_module_config(module_code, output_file=None): def nvm_available(): - return run(["/bin/bash", "-i", "-c", "type -t nvm"], stdout=DEVNULL).returncode == 0 + return run(["/usr/bin/env bash", "-i", "-c", "type -t nvm"], stdout=DEVNULL).returncode == 0 def install_frontend_dependencies(module_frontend_path): @@ -65,12 +65,12 @@ def install_frontend_dependencies(module_frontend_path): if nvm_available(): with (FRONTEND_DIR / ".nvmrc").open("r") as f: node_version = f.read().strip() - cmd = ["/bin/bash", "-i", "-c", f"nvm exec {node_version} {' '.join(cmd)}"] + cmd = ["/usr/bin/env bash", "-i", "-c", f"nvm exec {node_version} {' '.join(cmd)}"] run(cmd, check=True, cwd=module_frontend_path) def build_frontend(): cmd = ["npm", "run", "build"] if nvm_available(): - cmd = ["/bin/bash", "-i", "-c", f"nvm exec {' '.join(cmd)}"] + cmd = ["/usr/bin/env bash", "-i", "-c", f"nvm exec {' '.join(cmd)}"] run(cmd, check=True, cwd=str(FRONTEND_DIR)) diff --git a/data/migrations/2.0.1to2.1.0.sh b/data/migrations/2.0.1to2.1.0.sh index 80403e9167..44d1c5e826 100755 --- a/data/migrations/2.0.1to2.1.0.sh +++ b/data/migrations/2.0.1to2.1.0.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # faux sudo car sinon la commande "sudo -n -u" ne le demande pas sudo ls diff --git a/data/migrations/2.4.0to2.4.1_insert_departments.sh b/data/migrations/2.4.0to2.4.1_insert_departments.sh index 92520a49cb..48db9473eb 100755 --- a/data/migrations/2.4.0to2.4.1_insert_departments.sh +++ b/data/migrations/2.4.0to2.4.1_insert_departments.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash filepath=$(realpath $0) GEONATURE_ROOT=$(dirname $(dirname $(dirname $filepath))) @@ -16,4 +16,4 @@ export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f $GEO sudo -n -u postgres -s psql -d $db_name -c "DROP TABLE ref_geo.temp_fr_departements;" &>> $GEONATURE_ROOT/var/log/insert_departements.log rm $GEONATURE_ROOT/tmp/geonature/departement_admin_express_2020-02.zip -rm $GEONATURE_ROOT/tmp/geonature/fr_departements.sql \ No newline at end of file +rm $GEONATURE_ROOT/tmp/geonature/fr_departements.sql diff --git a/data/migrations/missing_grid.sh b/data/migrations/missing_grid.sh index 94ea99cdae..9d7ab61666 100755 --- a/data/migrations/missing_grid.sh +++ b/data/migrations/missing_grid.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . ../../config/settings.ini cd ../../ diff --git a/data/migrations/v1tov2/migratetoV2.sh b/data/migrations/v1tov2/migratetoV2.sh index efeaa25268..d85735e88c 100755 --- a/data/migrations/v1tov2/migratetoV2.sh +++ b/data/migrations/v1tov2/migratetoV2.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash . migratetoV2.ini . ../../../config/settings.ini echo $geonature1user diff --git a/data/migrations/v1tov2/my_organisme/mymigratetoV2.sh b/data/migrations/v1tov2/my_organisme/mymigratetoV2.sh index 4005d5e336..f52aa8649c 100755 --- a/data/migrations/v1tov2/my_organisme/mymigratetoV2.sh +++ b/data/migrations/v1tov2/my_organisme/mymigratetoV2.sh @@ -1,4 +1,4 @@ -#! /bin/bash +#! /usr/bin/env bash . ../migratetoV2.ini . mymigratetov2.ini . ../../../../config/settings.ini diff --git a/data/migrations/v1tov2/old/v1_compat.sh.old b/data/migrations/v1tov2/old/v1_compat.sh.old index b184262a26..0f291e450e 100755 --- a/data/migrations/v1tov2/old/v1_compat.sh.old +++ b/data/migrations/v1tov2/old/v1_compat.sh.old @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . v1_compat.ini . ../../../config/settings.ini diff --git a/data/scripts/backup/pgdump2ftpbackup.sh b/data/scripts/backup/pgdump2ftpbackup.sh index 5f9847e7ab..0a9b476716 100644 --- a/data/scripts/backup/pgdump2ftpbackup.sh +++ b/data/scripts/backup/pgdump2ftpbackup.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash BKPDIR="/var/backups/pgsql" TODAY=`date +%F` diff --git a/data/scripts/import_ginco/import_ca.sh b/data/scripts/import_ginco/import_ca.sh index 1dcef8acb0..95c817aad8 100644 --- a/data/scripts/import_ginco/import_ca.sh +++ b/data/scripts/import_ginco/import_ca.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . settings.ini # export all variable in settings.ini diff --git a/data/scripts/import_ginco/import_mtd.sh b/data/scripts/import_ginco/import_mtd.sh index 0a1854b6e8..a1b3bb7a5c 100755 --- a/data/scripts/import_ginco/import_mtd.sh +++ b/data/scripts/import_ginco/import_mtd.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . settings.ini # export all variable in settings.ini diff --git a/data/scripts/import_ginco/import_taxref/import_new_taxref_version.sh b/data/scripts/import_ginco/import_taxref/import_new_taxref_version.sh index ebab7f0442..345dce8649 100755 --- a/data/scripts/import_ginco/import_taxref/import_new_taxref_version.sh +++ b/data/scripts/import_ginco/import_taxref/import_new_taxref_version.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash . ../settings.ini mkdir -p /tmp/taxhub diff --git a/data/scripts/import_ginco/restore_db.sh b/data/scripts/import_ginco/restore_db.sh index 835e447924..c17b7ee3a0 100755 --- a/data/scripts/import_ginco/restore_db.sh +++ b/data/scripts/import_ginco/restore_db.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Scripts qui restaure une BDD GINCO à parit d'un DUMP SQL # Puis crée un Foreign Data Wrapper entre la base restaurée et la base GeoNature cible diff --git a/data/scripts/ref_geo/insert_reg.sh b/data/scripts/ref_geo/insert_reg.sh index 57f2c67952..ae2653bffc 100755 --- a/data/scripts/ref_geo/insert_reg.sh +++ b/data/scripts/ref_geo/insert_reg.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash filepath=$(realpath $0) GEONATURE_ROOT=$(dirname $(dirname $(dirname $filepath))) @@ -15,4 +15,4 @@ export PGPASSWORD=$user_pg_pass;psql -h $db_host -U $user_pg -d $db_name -f $GEO sudo -n -u postgres psql -d $db_name -c "DROP TABLE ref_geo.temp_fr_regions;" &>> $GEONATURE_ROOT/var/log/insert_reg.log # rm $GEONATURE_ROOT/tmp/geonature/reg_fr_admin_express_2020-07.zip -rm $GEONATURE_ROOT/tmp/geonature/fr_regions.sql \ No newline at end of file +rm $GEONATURE_ROOT/tmp/geonature/fr_regions.sql diff --git a/data/scripts/sensi/import_sensi_depobio.sh b/data/scripts/sensi/import_sensi_depobio.sh index 91c4c3ac06..fb343d7d6e 100755 --- a/data/scripts/sensi/import_sensi_depobio.sh +++ b/data/scripts/sensi/import_sensi_depobio.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # Script remplaçant les règles de sensibilité nationales et régionales intégrées dans GeoNature, par les règles départementales. # Utilisé pour DEPOBIO pour disposer des règles de sensibilité à jour, au niveau départemantal. diff --git a/install/00_install_nvm.sh b/install/00_install_nvm.sh index 865216cd55..a5f11f67d8 100755 --- a/install/00_install_nvm.sh +++ b/install/00_install_nvm.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash echo "Installation de nvm" diff --git a/install/01_install_backend.sh b/install/01_install_backend.sh index 34925baeb1..3bc6e3042f 100755 --- a/install/01_install_backend.sh +++ b/install/01_install_backend.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # DESC: Usage help # ARGS: None diff --git a/install/02_configure_systemd.sh b/install/02_configure_systemd.sh index fa6cae2569..253ec2aee7 100755 --- a/install/02_configure_systemd.sh +++ b/install/02_configure_systemd.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eo pipefail diff --git a/install/03_create_db.sh b/install/03_create_db.sh index 9baab9a8f5..15122407f5 100755 --- a/install/03_create_db.sh +++ b/install/03_create_db.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eo pipefail diff --git a/install/04_install_gn_modules.sh b/install/04_install_gn_modules.sh index ca98d5f240..64106b7305 100755 --- a/install/04_install_gn_modules.sh +++ b/install/04_install_gn_modules.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -eo pipefail diff --git a/install/05_install_frontend.sh b/install/05_install_frontend.sh index 5cecdc5c92..7dced1a0c0 100755 --- a/install/05_install_frontend.sh +++ b/install/05_install_frontend.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # DESC: Usage help # ARGS: None diff --git a/install/06_configure_apache.sh b/install/06_configure_apache.sh index f3dfd0536c..ff562eb88b 100755 --- a/install/06_configure_apache.sh +++ b/install/06_configure_apache.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )" . "${SCRIPT_DIR}/utils" diff --git a/install/install_all/install_all.sh b/install/install_all/install_all.sh index 496aa2f460..99bd0a35df 100755 --- a/install/install_all/install_all.sh +++ b/install/install_all/install_all.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash set -e diff --git a/install/migration/beta4tobeta5.sh b/install/migration/beta4tobeta5.sh index 494886506f..09b6cc8cee 100755 --- a/install/migration/beta4tobeta5.sh +++ b/install/migration/beta4tobeta5.sh @@ -1,4 +1,4 @@ -#/bin/bash +#/usr/bin/env bash BASE_DIR=$(readlink -e "${0%/*}") diff --git a/install/migration/migration.sh b/install/migration/migration.sh index 5758ccf83a..16601b7179 100755 --- a/install/migration/migration.sh +++ b/install/migration/migration.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash SERVICES=("geonature" "geonature-worker" "taxhub" "usershub") diff --git a/install/utils b/install/utils index 52ad18307b..79e7fccab0 100755 --- a/install/utils +++ b/install/utils @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash export BASE_DIR=$(dirname "${SCRIPT_DIR}") diff --git a/lint.sh b/lint.sh index 552626c9ad..f9399ad14f 100755 --- a/lint.sh +++ b/lint.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/usr/bin/env bash # backend black .