diff --git a/scripts/_common.sh b/scripts/_common.sh index 8d8bdc4..5035248 100644 --- a/scripts/_common.sh +++ b/scripts/_common.sh @@ -20,25 +20,25 @@ elif [ -n "$(uname -m | grep arm)" ]; then miniconda_architecture="arm" else ynh_die "Unable to detect your achitecture, please open a bug describing \ - your hardware and the result of the command \"uname -m\"." 1 + your hardware and the result of the command \"uname -m\"." 1 fi #================================================= # CREATE FOLDERS #================================================= create_dir() { - mkdir -p "$config_path" + mkdir -p "$config_path" } #================================================= # CONFIGURATION FILES FOR JUPYTERLAB #================================================= config_jupyterlab() { - create_dir + create_dir jupyterlab_conf_path="$config_path/jupyterhub_config.py" - ynh_backup_if_checksum_is_different $jupyterlab_conf_path + ynh_backup_if_checksum_is_different $jupyterlab_conf_path # JupyterLab configuration cp -f ../conf/jupyterhub_config.py $jupyterlab_conf_path @@ -50,18 +50,18 @@ config_jupyterlab() { ynh_replace_string "__FINAL_PATH__" "$final_path" $jupyterlab_conf_path ynh_replace_string "__ADMIN__" "$admin" $jupyterlab_conf_path - ynh_store_file_checksum $jupyterlab_conf_path + ynh_store_file_checksum $jupyterlab_conf_path } config_jupyter_notebook() { jupyter_notebook_conf_path="$final_path/etc/jupyter/jupyter_notebook_config.py" - ynh_backup_if_checksum_is_different $jupyter_notebook_conf_path + ynh_backup_if_checksum_is_different $jupyter_notebook_conf_path # Jupyter notebook configuration cp -f ../conf/jupyter_notebook_config.py $jupyter_notebook_conf_path - ynh_store_file_checksum $jupyter_notebook_conf_path + ynh_store_file_checksum $jupyter_notebook_conf_path } #================================================= @@ -108,41 +108,41 @@ update_src_version() { #================================================= # This function is inspired by the ynh_setup_source function, adapted to deal with .sh files setup_source() { - local src_id=${1:-app} # If the argument is not given, source_id equals "app" + local src_id=${1:-app} # If the argument is not given, source_id equals "app" - update_src_version # Update source file + update_src_version # Update source file - # Load value from configuration file (see above for a small doc about this file - # format) - local src_url=$(grep 'SOURCE_URL=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) - local src_sum=$(grep 'SOURCE_SUM=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) - local src_sumprg=$(grep 'SOURCE_SUM_PRG=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) - local src_format=$(grep 'SOURCE_FORMAT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) - local src_extract=$(grep 'SOURCE_EXTRACT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) - local src_in_subdir=$(grep 'SOURCE_IN_SUBDIR=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) - local src_filename=$(grep 'SOURCE_FILENAME=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + # Load value from configuration file (see above for a small doc about this file + # format) + local src_url=$(grep 'SOURCE_URL=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_sum=$(grep 'SOURCE_SUM=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_sumprg=$(grep 'SOURCE_SUM_PRG=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_format=$(grep 'SOURCE_FORMAT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_extract=$(grep 'SOURCE_EXTRACT=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_in_subdir=$(grep 'SOURCE_IN_SUBDIR=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) + local src_filename=$(grep 'SOURCE_FILENAME=' "$YNH_CWD/../conf/${src_id}.src" | cut -d= -f2-) - # Default value - src_sumprg=${src_sumprg:-sha256sum} - src_in_subdir=${src_in_subdir:-true} - src_format=${src_format:-tar.gz} - src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]') - src_extract=${src_extract:-true} - if [ "$src_filename" = "" ] ; then - src_filename="${src_id}.${src_format}" - fi - local local_src="/opt/yunohost-apps-src/${YNH_APP_ID}/${src_filename}" + # Default value + src_sumprg=${src_sumprg:-sha256sum} + src_in_subdir=${src_in_subdir:-true} + src_format=${src_format:-tar.gz} + src_format=$(echo "$src_format" | tr '[:upper:]' '[:lower:]') + src_extract=${src_extract:-true} + if [ "$src_filename" = "" ] ; then + src_filename="${src_id}.${src_format}" + fi + local local_src="/opt/yunohost-apps-src/${YNH_APP_ID}/${src_filename}" - if test -e "$local_src" - then # Use the local source file if it is present - cp $local_src $src_filename - else # If not, download the source - local out=`wget -nv -O $src_filename $src_url 2>&1` || ynh_print_err $out - fi + if test -e "$local_src" + then # Use the local source file if it is present + cp $local_src $src_filename + else # If not, download the source + local out=`wget -nv -O $src_filename $src_url 2>&1` || ynh_print_err $out + fi - # Check the control sum - echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status \ - || ynh_die "Corrupt source" + # Check the control sum + echo "${src_sum} ${src_filename}" | ${src_sumprg} -c --status \ + || ynh_die "Corrupt source" bash $src_filename -b -p $final_path