mirror of
https://github.com/YunoHost-Apps/minetest_ynh.git
synced 2024-09-03 20:36:00 +02:00
Merge pull request #26 from YunoHost-Apps/path_url
Remove not needed path_url
This commit is contained in:
commit
c3497377d4
3 changed files with 4 additions and 10 deletions
|
@ -24,7 +24,6 @@ ynh_abort_if_errors
|
|||
#=================================================
|
||||
|
||||
domain=$YNH_APP_ARG_DOMAIN
|
||||
path_url="/"
|
||||
is_public=$YNH_APP_ARG_IS_PUBLIC
|
||||
game=$YNH_APP_ARG_GAME
|
||||
pvp=$YNH_APP_ARG_PVP
|
||||
|
@ -42,16 +41,12 @@ ynh_script_progression --message="Validating installation parameters..."
|
|||
final_path=/opt/yunohost/$app
|
||||
test ! -e "$final_path" || ynh_die --message="This path already contains a folder"
|
||||
|
||||
# Register (book) web path
|
||||
ynh_webpath_register --app=$app --domain=$domain --path_url=$path_url
|
||||
|
||||
#=================================================
|
||||
# STORE SETTINGS FROM MANIFEST
|
||||
#=================================================
|
||||
ynh_script_progression --message="Storing installation settings..."
|
||||
|
||||
ynh_app_setting_set --app=$app --key=domain --value=$domain
|
||||
ynh_app_setting_set --app=$app --key=path --value=$path_url
|
||||
ynh_app_setting_set --app=$app --key=game --value=$game
|
||||
ynh_app_setting_set --app=$app --key=pvp --value=$pvp
|
||||
ynh_app_setting_set --app=$app --key=creative --value=$creative
|
||||
|
@ -143,9 +138,9 @@ else
|
|||
fi
|
||||
|
||||
pushd $final_path
|
||||
cmake . -DRUN_IN_PLACE=TRUE -DENABLE_LUAJIT=TRUE -DBUILD_CLIENT=FALSE -DBUILD_SERVER=TRUE
|
||||
ynh_exec_warn_less cmake . -DRUN_IN_PLACE=TRUE -DENABLE_LUAJIT=TRUE -DBUILD_CLIENT=FALSE -DBUILD_SERVER=TRUE
|
||||
|
||||
make -j$(nproc)
|
||||
ynh_exec_warn_less make -j$(nproc)
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
|
|
@ -27,7 +27,6 @@ ynh_script_progression --message="Loading installation settings..."
|
|||
|
||||
app=$YNH_APP_INSTANCE_NAME
|
||||
|
||||
path_url=$(ynh_app_setting_get --app=$app --key=path)
|
||||
final_path=$(ynh_app_setting_get --app=$app --key=final_path)
|
||||
home_path=$(ynh_app_setting_get --app=$app --key=home_path)
|
||||
port=$(ynh_app_setting_get --app=$app --key=port)
|
||||
|
|
|
@ -159,9 +159,9 @@ else
|
|||
fi
|
||||
|
||||
pushd $final_path
|
||||
cmake . -DRUN_IN_PLACE=TRUE -DENABLE_LUAJIT=TRUE -DBUILD_CLIENT=FALSE -DBUILD_SERVER=TRUE
|
||||
ynh_exec_warn_less cmake . -DRUN_IN_PLACE=TRUE -DENABLE_LUAJIT=TRUE -DBUILD_CLIENT=FALSE -DBUILD_SERVER=TRUE
|
||||
|
||||
make -j$(nproc)
|
||||
ynh_exec_warn_less make -j$(nproc)
|
||||
popd
|
||||
|
||||
#=================================================
|
||||
|
|
Loading…
Add table
Reference in a new issue