diff --git a/data/helpers.d/filesystem b/data/helpers.d/filesystem index c471a6872..3a7d6da25 100644 --- a/data/helpers.d/filesystem +++ b/data/helpers.d/filesystem @@ -65,25 +65,23 @@ ynh_backup() { # If backing up core only (used by ynh_backup_before_upgrade), # don't backup big data items if [ "$is_big" == "1" ] && [ "$BACKUP_CORE_ONLY" == "1" ] ; then - echo "$src_path will not be saved, because backup_core_only is set." >&2 + ynh_print_info --message="$src_path will not be saved, because backup_core_only is set." return 0 fi - + # ============================================================================== # Format correctly source and destination paths # ============================================================================== # Be sure the source path is not empty [[ -e "${src_path}" ]] || { - echo "Source path '${src_path}' does not exist" >&2 + ynh_print_warn --message="Source path '${src_path}' does not exist" if [ "$not_mandatory" == "0" ] then - echo "Source path '${src_path}' does not exist" >&2 - # This is a temporary fix for fail2ban config files missing after the migration to stretch. if echo "${src_path}" | grep --quiet "/etc/fail2ban" then touch "${src_path}" - echo "The missing file will be replaced by a dummy one for the backup !!!" >&2 + ynh_print_info --message="The missing file will be replaced by a dummy one for the backup !!!" else return 1 fi @@ -127,7 +125,7 @@ ynh_backup() { # Check if dest_path already exists in tmp archive [[ ! -e "${dest_path}" ]] || { - echo "Destination path '${dest_path}' already exist" >&2 + ynh_print_err --message="Destination path '${dest_path}' already exist" return 1 } @@ -280,7 +278,7 @@ ynh_bind_or_cp() { local AS_ROOT=${3:-0} local NO_ROOT=0 [[ "${AS_ROOT}" = "1" ]] || NO_ROOT=1 - echo "This helper is deprecated, you should use ynh_backup instead" >&2 + ynh_print_warn --message="This helper is deprecated, you should use ynh_backup instead" ynh_backup "$1" "$2" 1 } @@ -293,9 +291,9 @@ ynh_bind_or_cp() { # usage: ynh_mkdir_tmp # | ret: the created directory path ynh_mkdir_tmp() { - echo "The helper ynh_mkdir_tmp is deprecated." >&2 - echo "You should use 'mktemp -d' instead and manage permissions \ -properly with chmod/chown." >&2 + ynh_print_warn --message="The helper ynh_mkdir_tmp is deprecated." + ynh_print_warn --message="You should use 'mktemp -d' instead and manage permissions \ +properly with chmod/chown." local TMP_DIR=$(mktemp -d) # Give rights to other users could be a security risk. @@ -410,7 +408,7 @@ ynh_secure_remove () { if [ $# -ge 2 ] then - echo "/!\ Packager ! You provided more than one argument to ynh_secure_remove but it will be ignored... Use this helper with one argument at time." >&2 + ynh_print_warn --message="/!\ Packager ! You provided more than one argument to ynh_secure_remove but it will be ignored... Use this helper with one argument at time." fi if [[ "$forbidden_path" =~ "$file" \ @@ -420,13 +418,13 @@ ynh_secure_remove () { || "${file:${#file}-1}" = "/" ]] # Match if the path finishes by /. Because it seems there is an empty variable then - echo "Avoid deleting $file." >&2 + ynh_print_warn --message="Avoid deleting $file." else if [ -e "$file" ] then sudo rm -R "$file" else - echo "$file wasn't deleted because it doesn't exist." >&2 + ynh_print_info --message="$file wasn't deleted because it doesn't exist." fi fi } diff --git a/data/helpers.d/mysql b/data/helpers.d/mysql index d7400db2d..1dad94e13 100644 --- a/data/helpers.d/mysql +++ b/data/helpers.d/mysql @@ -225,10 +225,10 @@ ynh_mysql_remove_db () { local mysql_root_password=$(sudo cat $MYSQL_ROOT_PWD_FILE) if mysqlshow -u root -p$mysql_root_password | grep -q "^| $db_name"; then # Check if the database exists - echo "Removing database $db_name" >&2 + ynh_print_info --message="Removing database $db_name" ynh_mysql_drop_db $db_name # Remove the database else - echo "Database $db_name not found" >&2 + ynh_print_warn --message="Database $db_name not found" fi # Remove mysql user if it exists diff --git a/data/helpers.d/nodejs b/data/helpers.d/nodejs index 6833b7593..9295c4348 100644 --- a/data/helpers.d/nodejs +++ b/data/helpers.d/nodejs @@ -13,7 +13,7 @@ export N_PREFIX="$n_install_dir" # # Requires YunoHost version 2.7.12 or higher. ynh_install_n () { - echo "Installation of N - Node.js version management" >&2 + ynh_print_info --message="Installation of N - Node.js version management" # Build an app.src for n mkdir -p "../conf" echo "SOURCE_URL=https://github.com/tj/n/archive/v2.1.7.tar.gz diff --git a/data/helpers.d/package b/data/helpers.d/package index 9c2b58458..9d5ad3ac2 100644 --- a/data/helpers.d/package +++ b/data/helpers.d/package @@ -166,7 +166,7 @@ ynh_package_install_from_equivs () { local pkgname=$(grep '^Package: ' $controlfile | cut -d' ' -f 2) # Retrieve the name of the debian package local pkgversion=$(grep '^Version: ' $controlfile | cut -d' ' -f 2) # And its version number [[ -z "$pkgname" || -z "$pkgversion" ]] \ - && echo "Invalid control file" && exit 1 # Check if this 2 variables aren't empty. + && ynh_die --message="Invalid control file" # Check if this 2 variables aren't empty. # Update packages cache ynh_package_update diff --git a/data/helpers.d/psql b/data/helpers.d/psql index 959b7e63b..b36129041 100644 --- a/data/helpers.d/psql +++ b/data/helpers.d/psql @@ -244,18 +244,18 @@ ynh_psql_remove_db() { local psql_root_password=$(sudo cat $PSQL_ROOT_PWD_FILE) if ynh_psql_database_exists --database=$db_name; then # Check if the database exists - echo "Removing database $db_name" >&2 + ynh_print_info --message="Removing database $db_name" ynh_psql_drop_db $db_name # Remove the database else - echo "Database $db_name not found" >&2 + ynh_print_warn --message="Database $db_name not found" fi # Remove psql user if it exists if ynh_psql_user_exists --user=$db_user; then - echo "Removing user $db_user" >&2 + ynh_print_info --message="Removing user $db_user" ynh_psql_drop_user $db_user else - echo "User $db_user not found" >&2 + ynh_print_warn --message="User $db_user not found" fi } @@ -281,6 +281,7 @@ ynh_psql_test_if_first_run() { fi systemctl start postgresql + sudo --login --user=postgres psql -c"ALTER user postgres WITH PASSWORD '$pgsql'" postgres # force all user to connect to local database using passwords diff --git a/data/helpers.d/system b/data/helpers.d/system index 757fdf93c..b8971c80f 100644 --- a/data/helpers.d/system +++ b/data/helpers.d/system @@ -26,7 +26,7 @@ ynh_exit_properly () { trap '' EXIT # Ignore new exit signals set +eu # Do not exit anymore if a command fail or if a variable is empty - echo -e "!!\n $app's script has encountered an error. Its execution was cancelled.\n!!" >&2 + ynh_print_err --message="!!\n $app's script has encountered an error. Its execution was cancelled.\n!!" if type -t ynh_clean_setup > /dev/null; then # Check if the function exist in the app script. ynh_clean_setup # Call the function to do specific cleaning for the app. @@ -269,11 +269,11 @@ ynh_check_app_version_changed () { # Complete versions are the same if [ "$force_upgrade" != "0" ] then - echo "Upgrade forced by YNH_FORCE_UPGRADE." >&2 + ynh_print_info --message="Upgrade forced by YNH_FORCE_UPGRADE." unset YNH_FORCE_UPGRADE elif [ "$package_check" != "0" ] then - echo "Upgrade forced for package check." >&2 + ynh_print_info --message="Upgrade forced for package check." else ynh_die "Up-to-date, nothing to do" 0 fi diff --git a/data/helpers.d/user b/data/helpers.d/user index 9ee44515d..0c4591dcd 100644 --- a/data/helpers.d/user +++ b/data/helpers.d/user @@ -145,16 +145,16 @@ ynh_system_user_delete () { # Check if the user exists on the system if ynh_system_user_exists "$username" then - echo "Remove the user $username" >&2 + ynh_print_info --message="Remove the user $username" deluser $username else - echo "The user $username was not found" >&2 + ynh_print_warn --message="The user $username was not found" fi # Check if the group exists on the system if ynh_system_group_exists "$username" then - echo "Remove the group $username" >&2 + ynh_print_info --message="Remove the group $username" delgroup $username fi } diff --git a/data/helpers.d/utils b/data/helpers.d/utils index 7d943c9df..1519e6150 100644 --- a/data/helpers.d/utils +++ b/data/helpers.d/utils @@ -40,7 +40,7 @@ ynh_get_plain_key() { # # Requires YunoHost version 2.7.2 or higher. ynh_restore_upgradebackup () { - echo "Upgrade failed." >&2 + ynh_print_err --message="Upgrade failed." local app_bck=${app//_/-} # Replace all '_' by '-' NO_BACKUP_UPGRADE=${NO_BACKUP_UPGRADE:-0} @@ -57,7 +57,7 @@ ynh_restore_upgradebackup () { ynh_die --message="The app was restored to the way it was before the failed upgrade." fi else - echo "\$NO_BACKUP_UPGRADE is set, that means there's no backup to restore. You have to fix this upgrade by yourself !" >&2 + ynh_print_warn --message="\$NO_BACKUP_UPGRADE is set, that means there's no backup to restore. You have to fix this upgrade by yourself !" fi } @@ -74,7 +74,7 @@ ynh_restore_upgradebackup () { ynh_backup_before_upgrade () { if [ ! -e "/etc/yunohost/apps/$app/scripts/backup" ] then - echo "This app doesn't have any backup script." >&2 + ynh_print_warn --message="This app doesn't have any backup script." return fi backup_number=1 @@ -106,7 +106,7 @@ ynh_backup_before_upgrade () { ynh_die --message="Backup failed, the upgrade process was aborted." fi else - echo "\$NO_BACKUP_UPGRADE is set, backup will be avoided. Be careful, this upgrade is going to be operated without a security backup" + ynh_print_warn --message="\$NO_BACKUP_UPGRADE is set, backup will be avoided. Be careful, this upgrade is going to be operated without a security backup" fi }