Some minor code cleanup

conf/app.src

@@ -1,3 +1,4 @@
-SOURCE_URL=https://codeberg.org/streams/streams/archive/b7db8b66261fa6a18dc59890d5461c2fb85242fa.tar.gz
-SOURCE_SUM=adf9e6a18cdea8df8dd22fb35afc201c2a8660327c055ef445fbae89190d8df1
+SOURCE_URL=https://codeberg.org/streams/streams/archive/2ae1943eb9c26b3c798d1c7289d356612c9b6644.tar.gz
+SOURCE_SUM=7a5f8ddc4d5dcf417e980103c5191bd8d899a96a2fa62cb13ed92bd216b30d25
+SOURCE_SUM_PRG=sha256sum
 SOURCE_FORMAT=tar.gz

conf/poller-cron

@@ -1,2 +1,2 @@
 # Run poller periodically to update your website
-*/10 * * * * __APP__ cd __FINALPATH__; /usr/bin/php__PHPVERSION__ Code/Daemon/Run.php Cron > /dev/null 2>&1
+*/10 * * * * __APP__ ; /usr/bin/php__PHPVERSION__ __FINALPATH__/Code/Daemon/Run.php Cron > /dev/null 2>&1

manifest.json

@@ -42,13 +42,13 @@
             },
             {
                 "name": "database",
-                "type": "string",
+                "type": "select",
                 "ask": {
                     "en": "Choose the database to be used for your website [mysql:1,postgresql:2]",
                     "fr": "Choisissez la base de données utilisée pour votre site [mysql:1,postgresql:2]"
                 },
-                "choices": ["1", "2"],
-                "default": "1"
+                "choices": ["mysql", "postgresql"],
+                "default": "mysql"
             }
         ]
     }

scripts/backup

@@ -59,10 +59,10 @@ ynh_backup --src_path="/etc/php/$phpversion/fpm/pool.d/$app.conf"
 # BACKUP OF THE  DATABASE
 #=================================================
 
-if [  $database -eq 1 ]; then
+if [  $database == "mysql" ]; then
 	ynh_print_info --message="Backup of the  MySQL database..."
 	ynh_mysql_dump_db --database="$db_name" > db.sql
-elif [ $database -eq 2 ]; then
+elif [ $database == "postgresql" ]; then
 	# Removing postgresSQL database
 	ynh_print_info --message="Backup of the  postgreSQL database..."
     ynh_psql_dump_db --database="$db_name" > db.sql

scripts/install

@@ -25,7 +25,7 @@ path_url="/"
 admin=$YNH_APP_ARG_ADMIN
 email=$(ynh_user_get_info --username=$admin --key=mail)
 upload="256M"
-database="1"
+database="mysql"
 random_string=$(ynh_string_random --length=48)
 database=`expr $YNH_APP_ARG_DATABASE`
 
@@ -63,7 +63,7 @@ ynh_app_setting_set --app=$app --key=random_string --value=$random_string
 ynh_print_info "Installing dependencies..."
 
 ynh_install_app_dependencies $pkg_dependencies_main
-if [ $database -eq 2 ]; then
+if [ $database == "mysql" ]; then
 	ynh_install_app_dependencies $pkg_dependencies_psql
 fi
 
@@ -150,7 +150,7 @@ chown -R $app:www-data "$final_path"
 # CREATE A  DATABASE
 #=================================================
 
-if [  $database -eq 1 ]; then
+if [  $database == "mysql" ]; then
 	ynh_script_progression --message="Creating a MySQL database..."
 	db_name=$(ynh_sanitize_dbid --db_name=$app)
 	db_user=$db_name
@@ -158,7 +158,7 @@ if [  $database -eq 1 ]; then
 	ynh_mysql_setup_db --db_user=$db_user --db_name=$db_name
 	ynh_script_progression --message="Importing database..."
 	ynh_mysql_connect_as --user="$db_name" --password="$db_pwd" --database="$db_name" < $final_path/install/schema_mysql.sql
-elif [ $database -eq 2 ]; then
+elif [ $database == "postgresql" ]; then
 	# Create postgresql database
 	ynh_script_progression --message="Creating a postgresql database..."
 	ynh_replace_string --match_string="db_type = 0;" --replace_string="db_type = 1;" --target_file="$config"

scripts/remove

@@ -26,10 +26,10 @@ database=$(ynh_app_setting_get --app=$app --key=database)
 # REMOVE THE DATABASE
 #=================================================
 
-if [  $database -eq 1 ]; then
+if [  $database == "mysql" ]; then
 	ynh_script_progression --message="Removing  MySQL database..."
 	ynh_mysql_remove_db --db_user=$db_user --db_name=$db_name
-elif [ $database -eq 2 ]; then
+elif [ $database == "postgresql" ]; then
 	# Removing postgresql database
 	ynh_script_progression --message="Removing  postgreSQL database..."
     ynh_psql_remove_db --db_user=$db_user --db_name=$db_name

scripts/restore

@@ -74,12 +74,12 @@ ynh_script_progression --message="Restoring the database..."
 
 ynh_install_app_dependencies $pkg_dependencies_main
 
-if [  $database -eq 1 ]; then
+if [  $database == "mysql" ]; then
 	ynh_script_progression --message="Restoring  MySQL database..."
 	db_pwd=$(ynh_app_setting_get --app=$app --key=mysqlpwd)
 	ynh_mysql_setup_db --db_user=$db_name --db_name=$db_name --db_pwd=$db_pwd
 	ynh_mysql_connect_as --user=$db_name --password=$db_pwd --database=$db_name < ./db.sql
-elif [ $database -eq 2 ]; then
+elif [ $database == "postgresql" ]; then
 	# Reinstalling postgresql database
 	ynh_script_progression --message="Reinstalling dependencies..."
 	# Define and install dependencies