diff --git a/scripts/actions/add_remove_abiword b/scripts/actions/add_remove_abiword index 24622ee..771434a 100755 --- a/scripts/actions/add_remove_abiword +++ b/scripts/actions/add_remove_abiword @@ -33,14 +33,14 @@ app=$YNH_APP_INSTANCE_NAME # Check the dependencies of the meta packages of etherpad_mypads with apt-cache if apt-cache depends ${app//_/-}-ynh-deps | grep --quiet abiword then - # abiword is already a dependence of etherpad_mypads. - # abiword should be removed. + # Abiword is already a dependence of etherpad_mypads. + # Abiword should be removed. abiword=0 action1=removed action2=Removing else - # abiword isn't a dependence of etherpad_mypads. - # abiword should be installed. + # Abiword isn't a dependence of etherpad_mypads. + # Abiword should be installed. abiword=1 action1=installed action2=Installing @@ -50,11 +50,11 @@ ynh_print_info --message="Abiword will be $action1." if apt-cache depends ${app//_/-}-ynh-deps | grep --quiet libreoffice-writer then - # libreoffice is already a dependence of etherpad_mypads. + # LibreOffice is already a dependence of Etherpad MyPads. # Keep it libreoffice=1 else - # libreoffice isn't a dependence of etherpad_mypads. + # LibreOffice isn't a dependence of Etherpad MyPads. # Do not add it libreoffice=0 fi @@ -67,18 +67,18 @@ fi ynh_script_progression --message="$action2 AbiWord..." --weight=3 -# Load common variables, and especially abiword dependencies. +# Load common variables, and especially Abiword dependencies. source scripts/_variables dependencies="" if [ $abiword -eq 1 ] then - # Add abiword dependencies if abiword has to be installed + # Add abiword dependencies if Abiword has to be installed dependencies="$dependencies $abiword_app_depencencies" fi if [ $libreoffice -eq 1 ] then - # Add libreoffice dependencies if libreoffice is already installed to keep it as a dependence. + # Add LibreOffice dependencies if LibreOffice is already installed to keep it as a dependence. dependencies="$dependencies $libreoffice_app_dependencies" fi @@ -95,11 +95,11 @@ ynh_package_autopurge if [ $abiword -eq 1 ] then - # Set abiword as default export app + # Set Abiword as default export app yunohost app config apply $app -a "YNH_CONFIG_MAIN_EXPORT_EXPORT=abiword" elif [ $libreoffice -eq 1 ] then - # Set libreoffice as default export app + # Set LibreOffice as default export app yunohost app config apply $app -a "YNH_CONFIG_MAIN_EXPORT_EXPORT=libreoffice" else # Remove any export app diff --git a/scripts/actions/add_remove_libreoffice b/scripts/actions/add_remove_libreoffice index 24bc7dd..19d5788 100755 --- a/scripts/actions/add_remove_libreoffice +++ b/scripts/actions/add_remove_libreoffice @@ -30,17 +30,17 @@ app=$YNH_APP_INSTANCE_NAME # CHECK IF AN ACTION HAS TO BE DONE #================================================= -# Check the dependencies of the meta packages of etherpad_mypads with apt-cache +# Check the dependencies of the meta packages of Etherpad MyPads with apt-cache if apt-cache depends ${app//_/-}-ynh-deps | grep --quiet libreoffice-writer then - # libreoffice is already a dependence of etherpad_mypads. - # libreoffice should be removed. + # LibreOffice is already a dependence of Etherpad myPads. + # LibreOffice should be removed. libreoffice=0 action1=removed action2=Removing else - # libreoffice isn't a dependence of etherpad_mypads. - # libreoffice should be installed. + # LibreOffice isn't a dependence of Etherpad MyPads. + # LibreOffice should be installed. libreoffice=1 action1=installed action2=Installing @@ -50,11 +50,11 @@ ynh_print_info --message="LibreOffice will be $action1." if apt-cache depends ${app//_/-}-ynh-deps | grep --quiet abiword then - # abiword is already a dependence of etherpad_mypads. + # Abiword is already a dependence of Etherpad MyPads. # Keep it abiword=1 else - # abiword isn't a dependence of etherpad_mypads. + # Abiword isn't a dependence of Etherpad MyPads. # Do not add it abiword=0 fi @@ -73,7 +73,7 @@ source scripts/_variables dependencies="" if [ $libreoffice -eq 1 ] then - # Add LibreOffice dependencies if libreoffice has to be installed + # Add LibreOffice dependencies if LibreOffice has to be installed dependencies="$dependencies $libreoffice_app_dependencies" fi if [ $abiword -eq 1 ] diff --git a/scripts/change_url b/scripts/change_url index b3954a7..e561950 100644 --- a/scripts/change_url +++ b/scripts/change_url @@ -92,21 +92,21 @@ ynh_script_progression --message="Updating NGINX web server configuration..." -- nginx_conf_path=/etc/nginx/conf.d/$old_domain.d/$app.conf -# Change the path in the nginx config file +# Change the path in the NGINX config file if [ $change_path -eq 1 ] then - # Make a backup of the original nginx config file if modified + # Make a backup of the original NGINX config file if modified ynh_backup_if_checksum_is_different --file="$nginx_conf_path" - # Set global variables for nginx helper + # Set global variables for NGINX helper domain="$old_domain" path_url="$new_path" - # Create a dedicated nginx config + # Create a dedicated NGINX config ynh_add_nginx_config fi -# Change the domain for nginx +# Change the domain for NGINX if [ $change_domain -eq 1 ] then # Delete file checksum for the old conf file location diff --git a/scripts/install b/scripts/install index d52d9d6..9b9366d 100644 --- a/scripts/install +++ b/scripts/install @@ -139,7 +139,7 @@ ynh_setup_source --dest_dir="$final_path" #================================================= ynh_script_progression --message="Configuring NGINX web server..." --weight=2 -# Create a dedicated nginx config +# Create a dedicated NGINX config ynh_add_nginx_config #================================================= @@ -180,15 +180,15 @@ cp ../conf/settings.json "$final_path/settings.json" ynh_replace_string --match_string="__PORT__" --replace_string="$port" --target_file="$final_path/settings.json" if [ "$export" = "abiword" ] then - # Get abiword binary path + # Get Abiword binary path abiword_path=`which abiword` - # Set the path of abiword into etherpad config + # Set the path of abiword into Etherpad config ynh_replace_string --match_string="\"abiword\" : null" --replace_string="\"abiword\" : \"$abiword_path\"" --target_file="$final_path/settings.json" elif [ "$export" = "libreoffice" ] then # Get soffice binary path soffice_path=`which soffice` - # Set the path of soffice into etherpad config + # Set the path of soffice into Etherpad config ynh_replace_string --match_string="\"soffice\" : null" --replace_string="\"soffice\" : \"$soffice_path\"" --target_file="$final_path/settings.json" fi ynh_replace_string --match_string="__LANGUAGE__" --replace_string="$language" --target_file="$final_path/settings.json" @@ -253,7 +253,7 @@ ynh_npm install ep_headings2@${ep_headings2_version} >> $install_log 2>&1 # Framapad - Edit and Export as Markdown in Etherpad ynh_npm install ep_markdown@${ep_markdown_version} >> $install_log 2>&1 if [ $mypads -eq 1 ]; then - # Framapad - Groups and private pads for etherpad + # Framapad - Groups and private pads for Etherpad ynh_npm install ep_mypads@${mypads_version} >> $install_log 2>&1 fi # Framapad - Add support to do 'Spell checking' @@ -335,7 +335,7 @@ fi # SEND A README FOR THE ADMIN #================================================= -# Get main domain and buid the url of the admin panel of the app. +# Get main domain and buid the URL of the admin panel of the app. admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app" if [ $mypads -eq 1 ] diff --git a/scripts/remove b/scripts/remove index 5378b48..d5957c8 100755 --- a/scripts/remove +++ b/scripts/remove @@ -81,7 +81,7 @@ ynh_secure_remove --file="/var/www/$app" #================================================= ynh_script_progression --message="Removing NGINX web server configuration..." --weight=2 -# Remove the dedicated nginx config +# Remove the dedicated NGINX config ynh_remove_nginx_config #================================================= diff --git a/scripts/upgrade b/scripts/upgrade index 2d8f8b5..51030ea 100644 --- a/scripts/upgrade +++ b/scripts/upgrade @@ -221,7 +221,7 @@ fi #================================================= ynh_script_progression --message="Upgrading NGINX web server configuration..." -# Overwrite the nginx configuration only if it's allowed +# Overwrite the NGINX configuration only if it's allowed if [ $overwrite_nginx -eq 1 ] then ynh_add_nginx_config @@ -394,7 +394,7 @@ fi # SECURING FILES AND DIRECTORIES #================================================= -# Set files ownership to etherpad +# Set files ownership to Etherpad chown -R $app: $final_path chmod o-rwx $final_path # Restrict access to credentials.json @@ -473,7 +473,7 @@ ynh_maintenance_mode_OFF # SEND A README FOR THE ADMIN #================================================= -# Get main domain and buid the url of the admin panel of the app. +# Get main domain and buid the URL of the admin panel of the app. admin_panel="https://$(grep portal_domain /etc/ssowat/conf.json | cut -d'"' -f4)/yunohost/admin/#/apps/$app" # Build the changelog