Use BashUtilities for basic functions

This commit is contained in:
Kevin 2019-07-12 14:11:05 +02:00
parent 750f3bd0d3
commit 0c903f9d4b
8 changed files with 18 additions and 40 deletions

3
.gitmodules vendored Normal file
View file

@ -0,0 +1,3 @@
[submodule "BashUtilities"]
path = BashUtilities
url = https://github.com/Darklg/BashUtilities.git

1
BashUtilities Submodule

@ -0,0 +1 @@
Subproject commit 9edd770e30643242114ac7f82d4930c4b576604b

View file

@ -54,18 +54,18 @@ _functions_enable_multilingual='false';
if [[ "${project_l10n}" == 'y' ]]; then
_functions_enable_multilingual='true';
fi;
wpuinstaller_sed "s/project_is_multilingual/__return_${_functions_enable_multilingual}/g" "${_functions_file}";
bashutilities_sed "s/project_is_multilingual/__return_${_functions_enable_multilingual}/g" "${_functions_file}";
# Settings plugin
cp "${SCRIPTDIR}inc/base_settings.php" "${MAINDIR}${WP_MUPLUGINS_DIR}${project_id}/${project_id}_settings.php";
wpuinstaller_sed "s/wpuprojectid/${project_id}/g" "${MAINDIR}${WP_MUPLUGINS_DIR}${project_id}/${project_id}_settings.php";
wpuinstaller_sed "s/wpuproject/${project_name}/g" "${MAINDIR}${WP_MUPLUGINS_DIR}${project_id}/${project_id}_settings.php";
bashutilities_sed "s/wpuprojectid/${project_id}/g" "${MAINDIR}${WP_MUPLUGINS_DIR}${project_id}/${project_id}_settings.php";
bashutilities_sed "s/wpuproject/${project_name}/g" "${MAINDIR}${WP_MUPLUGINS_DIR}${project_id}/${project_id}_settings.php";
# Home page
if [[ "${home_is_cms}" == 'y' ]]; then
cp "${SCRIPTDIR}inc/cms_home.php" "${MAINDIR}${WP_MUPLUGINS_DIR}${project_id}/${project_id}_home.php";
wpuinstaller_sed "s/wpuprojectname/${project_name}/g" "${MAINDIR}${WP_MUPLUGINS_DIR}${project_id}/${project_id}_home.php";
wpuinstaller_sed "s/wpuprojectid/${project_id}/g" "${MAINDIR}${WP_MUPLUGINS_DIR}${project_id}/${project_id}_home.php";
bashutilities_sed "s/wpuprojectname/${project_name}/g" "${MAINDIR}${WP_MUPLUGINS_DIR}${project_id}/${project_id}_home.php";
bashutilities_sed "s/wpuprojectid/${project_id}/g" "${MAINDIR}${WP_MUPLUGINS_DIR}${project_id}/${project_id}_home.php";
home__page_id=$(php ${WPU_PHPCLI} option get home__page_id)
php ${WPU_PHPCLI} option update page_on_front "${home__page_id}";
php ${WPU_PHPCLI} option update show_on_front "page";

View file

@ -27,7 +27,7 @@ if [[ $wpu_add_shell_scripts == 'y' ]]; then
fi;
# Add example
cp "${SCRIPTDIR}inc/base_shell.php" "${WPU_SHELL}clean.php"
wpuinstaller_sed "s/wpuprojectid/${project_id}/g" "${WPU_SHELL}clean.php";
bashutilities_sed "s/wpuprojectid/${project_id}/g" "${WPU_SHELL}clean.php";
cd "${MAINDIR}";
fi;

View file

@ -43,14 +43,14 @@ cp "${SCRIPTDIR}inc/home.php" "${WPU_THEME}home.php";
# - Functions
cp "${SCRIPTDIR}inc/functions.php" "${WPU_THEME}functions.php";
wpuinstaller_sed "s/wpuproject/${project_id}/g" "${WPU_THEME}functions.php";
bashutilities_sed "s/wpuproject/${project_id}/g" "${WPU_THEME}functions.php";
# - Templates
cp -rf "${SCRIPTDIR}inc/tpl/" "${WPU_THEME}tpl/";
# - Tests
cp -rf "${SCRIPTDIR}inc/tests/" "${WPU_THEME}tests/";
wpuinstaller_sed "s,wpuprojecturl,${project_dev_url},g" "${WPU_THEME}tests/config.json";
bashutilities_sed "s,wpuprojecturl,${project_dev_url},g" "${WPU_THEME}tests/config.json";
# - Translation
mkdir "${WPU_THEME}inc/";
@ -59,8 +59,8 @@ echo 'deny from all' > "${WPU_THEME}inc/.htaccess";
mkdir "${WPU_THEME}inc/lang/";
WPU_THEME_TRANSLATE_FILE="${WPU_THEME}inc/lang/${WP_LOCALE}.po";
cp "${SCRIPTDIR}inc/lang/fr_FR.po" "${WPU_THEME_TRANSLATE_FILE}";
wpuinstaller_sed "s/fr_FR/${WP_LOCALE}/g" "${WPU_THEME_TRANSLATE_FILE}";
wpuinstaller_sed "s/wpuproject/${project_name}/g" "${WPU_THEME_TRANSLATE_FILE}";
bashutilities_sed "s/fr_FR/${WP_LOCALE}/g" "${WPU_THEME_TRANSLATE_FILE}";
bashutilities_sed "s/wpuproject/${project_name}/g" "${WPU_THEME_TRANSLATE_FILE}";
# - Assets
mkdir "${WPU_THEME}assets/";

View file

@ -1,26 +0,0 @@
#!/bin/bash
# http://stackoverflow.com/a/26655887
# Parse JSON
function stackov_parse_json()
{
echo $1 | \
sed -e 's/[{}]/''/g' | \
sed -e 's/", "/'\",\"'/g' | \
sed -e 's/" ,"/'\",\"'/g' | \
sed -e 's/" , "/'\",\"'/g' | \
sed -e 's/","/'\"---SEPERATOR---\"'/g' | \
awk -F=':' -v RS='---SEPERATOR---' "\$1~/\"$2\"/ {print}" | \
sed -e "s/\"$2\"://" | \
tr -d "\n\t" | \
sed -e 's/\\"/"/g' | \
sed -e 's/\\\\/\\/g' | \
sed -e 's/^[ \t]*//g' | \
sed -e 's/^"//' -e 's/"$//'
}
function wpuinstaller_sed(){
sed -i.bak "${1}" "${2}";
rm "${2}.bak";
}

View file

@ -11,7 +11,7 @@ if [[ ! -d 'wp-content' ]]; then
if [[ $use_subfolder == 'y' ]]; then
# Retrieve last WordPress version
wget -O "${MAINDIR}version.json" http://api.wordpress.org/core/version-check/1.7/;
wp_version=$(stackov_parse_json $(cat ${MAINDIR}version.json) version);
wp_version=$(bashutilities_parse_json $(cat ${MAINDIR}version.json) version);
git submodule add --quiet --depth 1 https://github.com/wordpress/wordpress wp-cms;
echo "... loading latest WordPress version";
cd "${MAINDIR}wp-cms";
@ -67,9 +67,9 @@ if (WP_DEBUG) {
PHP
if [[ ${use_subfolder} == 'y' ]]; then
wpuinstaller_sed "s/##WPUINSTALLER##/define('WP_CONTENT_DIR', dirname(__FILE__)\.'\/\.\.\/wp-content');/g" "${MAINDIR}wp-cms/wp-config.php";
bashutilities_sed "s/##WPUINSTALLER##/define('WP_CONTENT_DIR', dirname(__FILE__)\.'\/\.\.\/wp-content');/g" "${MAINDIR}wp-cms/wp-config.php";
else
wpuinstaller_sed "s/##WPUINSTALLER##//g" "${MAINDIR}wp-config.php";
bashutilities_sed "s/##WPUINSTALLER##//g" "${MAINDIR}wp-config.php";
fi;
fi;

View file

@ -4,7 +4,7 @@ MAINDIR="${PWD}/";
SCRIPTDIR="$( dirname "${BASH_SOURCE[0]}" )/";
export PATH=$PATH:/Applications/MAMP/Library/bin/
. "${SCRIPTDIR}bin/tools.sh";
. "${SCRIPTDIR}BashUtilities/tools/functions.sh";
. "${SCRIPTDIR}bin/vars.sh";
. "${SCRIPTDIR}bin/questions.sh";
. "${SCRIPTDIR}bin/git.sh";