mirror of
https://github.com/YunoHost-Apps/phpmyadmin_ynh.git
synced 2024-09-03 19:56:46 +02:00
Make the app retro-compatible
This commit is contained in:
parent
b71dc520ab
commit
a76ac5e346
3 changed files with 30 additions and 4 deletions
|
@ -38,7 +38,7 @@ sudo wget -nv https://files.phpmyadmin.net/phpMyAdmin/$version/phpMyAdmin-$versi
|
||||||
sudo wget -nv https://files.phpmyadmin.net/phpMyAdmin/$version/phpMyAdmin-$version-all-languages.tar.gz.sha256 -O phpMyAdmin-$version-all-languages.tar.gz.sha256
|
sudo wget -nv https://files.phpmyadmin.net/phpMyAdmin/$version/phpMyAdmin-$version-all-languages.tar.gz.sha256 -O phpMyAdmin-$version-all-languages.tar.gz.sha256
|
||||||
sudo sha256sum -c phpMyAdmin-$version-all-languages.tar.gz.sha256 --status || (echo "Corrupt source" >&2 && false)
|
sudo sha256sum -c phpMyAdmin-$version-all-languages.tar.gz.sha256 --status || (echo "Corrupt source" >&2 && false)
|
||||||
sudo tar xzf phpMyAdmin-$version-all-languages.tar.gz -C ../sources/ > /dev/null 2>&1
|
sudo tar xzf phpMyAdmin-$version-all-languages.tar.gz -C ../sources/ > /dev/null 2>&1
|
||||||
sudo cp -r ../sources/phpMyAdmin-$version-all-languages/. $final_path
|
sudo cp -a ../sources/phpMyAdmin-$version-all-languages/. "$final_path"
|
||||||
|
|
||||||
# Create db
|
# Create db
|
||||||
db_user=$app
|
db_user=$app
|
||||||
|
@ -49,7 +49,7 @@ CHECK_VAR "$db_pwd" "db_pwd empty"
|
||||||
# Utilise '$app' comme nom d'utilisateur et de base de donnée
|
# Utilise '$app' comme nom d'utilisateur et de base de donnée
|
||||||
# Initialise la base de donnée et stocke le mot de passe mysql.
|
# Initialise la base de donnée et stocke le mot de passe mysql.
|
||||||
ynh_mysql_create_db "$db_user" "$db_user" $db_pwd
|
ynh_mysql_create_db "$db_user" "$db_user" $db_pwd
|
||||||
ynh_app_setting_set $app db_pwd $db_pwd
|
ynh_app_setting_set $app mysqlpwd $db_pwd
|
||||||
ynh_app_setting_set $app db_user $db_user
|
ynh_app_setting_set $app db_user $db_user
|
||||||
sed -i "s@YNH_PMA_USER@$db_user@g" ../conf/create_db.sql
|
sed -i "s@YNH_PMA_USER@$db_user@g" ../conf/create_db.sql
|
||||||
sudo mysql -u root -p$(sudo cat /etc/yunohost/mysql) < ../conf/create_db.sql
|
sudo mysql -u root -p$(sudo cat /etc/yunohost/mysql) < ../conf/create_db.sql
|
||||||
|
|
|
@ -11,7 +11,7 @@ path=$(ynh_app_setting_get $app path)
|
||||||
admin=$(ynh_app_setting_get $app admin)
|
admin=$(ynh_app_setting_get $app admin)
|
||||||
final_path=$(ynh_app_setting_get $app final_path)
|
final_path=$(ynh_app_setting_get $app final_path)
|
||||||
db_user=$(ynh_app_setting_get $app db_user)
|
db_user=$(ynh_app_setting_get $app db_user)
|
||||||
db_pwd=$(ynh_app_setting_get $app db_pwd)
|
db_pwd=$(ynh_app_setting_get $app mysqlpwd)
|
||||||
|
|
||||||
if [ -d $final_path ]; then
|
if [ -d $final_path ]; then
|
||||||
echo "There is already a directory: $final_path " >&2
|
echo "There is already a directory: $final_path " >&2
|
||||||
|
|
|
@ -12,11 +12,37 @@ domain=$(ynh_app_setting_get $app domain)
|
||||||
path=$(ynh_app_setting_get $app path)
|
path=$(ynh_app_setting_get $app path)
|
||||||
admin=$(ynh_app_setting_get $app admin)
|
admin=$(ynh_app_setting_get $app admin)
|
||||||
final_path=$(ynh_app_setting_get $app final_path)
|
final_path=$(ynh_app_setting_get $app final_path)
|
||||||
db_pwd=$(ynh_app_setting_get $app db_pwd)
|
db_pwd=$(ynh_app_setting_get $app mysqlpwd)
|
||||||
db_user=$(ynh_app_setting_get $app db_user)
|
db_user=$(ynh_app_setting_get $app db_user)
|
||||||
|
|
||||||
CHECK_PATH # Vérifie et corrige la syntaxe du path.
|
CHECK_PATH # Vérifie et corrige la syntaxe du path.
|
||||||
|
|
||||||
|
# We make the app retro-compatible with previous versions
|
||||||
|
if [[ -z "$final_path" ]];
|
||||||
|
then
|
||||||
|
final_path="/var/www/$app"
|
||||||
|
ynh_app_setting_set "$app" final_path "$final_path"
|
||||||
|
else
|
||||||
|
echo "${final_path} exists, we don't create it."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# In older version, db_user was always phpmyadmin
|
||||||
|
if [[ -z "$db_user" ]];
|
||||||
|
then
|
||||||
|
db_user="phpmyadmin"
|
||||||
|
ynh_app_setting_set "$app" db_user "$db_user"
|
||||||
|
else
|
||||||
|
echo "${db_user} exists, we don't create it."
|
||||||
|
fi
|
||||||
|
|
||||||
|
# In older version, the admin setting was admin_user
|
||||||
|
if [[ -z "$admin" ]]; then
|
||||||
|
admin=$(ynh_app_setting_get $app admin_user)
|
||||||
|
ynh_app_setting_set "$app" admin "$admin"
|
||||||
|
ynh_app_setting_delete $app admin_user
|
||||||
|
fi
|
||||||
|
|
||||||
|
|
||||||
# Copy files to the right place
|
# Copy files to the right place
|
||||||
version=$(cat ../sources/upstream_version)
|
version=$(cat ../sources/upstream_version)
|
||||||
sudo wget -nv https://files.phpmyadmin.net/phpMyAdmin/$version/phpMyAdmin-$version-all-languages.tar.gz -O phpMyAdmin-$version-all-languages.tar.gz
|
sudo wget -nv https://files.phpmyadmin.net/phpMyAdmin/$version/phpMyAdmin-$version-all-languages.tar.gz -O phpMyAdmin-$version-all-languages.tar.gz
|
||||||
|
|
Loading…
Add table
Reference in a new issue