1
0
Fork 0
mirror of https://github.com/YunoHost-Apps/codimd_ynh.git synced 2024-09-03 18:16:32 +02:00

Merge pull request #19 from Lab-8916100448256/CodiMD-1.6

Fix install + bump to version 1.6
This commit is contained in:
Alexandre Aubin 2020-04-27 04:09:31 +02:00 committed by GitHub
commit 116959e9f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
5 changed files with 22 additions and 9 deletions

View file

@ -2,7 +2,7 @@
A collaborative editor to work on notes written in Markdown A collaborative editor to work on notes written in Markdown
**Shipped version:** 1.5.0 **Shipped version:** 1.6.0
**Status**: In progress, do *not* consider this app as stable and fully working (yet) **Status**: In progress, do *not* consider this app as stable and fully working (yet)

View file

@ -1,5 +1,5 @@
SOURCE_URL=https://github.com/codimd/server/archive/1.5.0.tar.gz SOURCE_URL=https://github.com/codimd/server/archive/1.6.0.tar.gz
SOURCE_SUM=2321fb054c85e5ffcb73443e3ea9fbf8c370387f2b5709a23c21f71233fdb454 SOURCE_SUM=3639eaf70a37ee0513c75259c70b3d0c2c10116e9b2989dc9c571f98017120bd
SOURCE_SUM_PRG=sha256sum SOURCE_SUM_PRG=sha256sum
SOURCE_FORMAT=tar.gz SOURCE_FORMAT=tar.gz
SOURCE_IN_SUBDIR=true SOURCE_IN_SUBDIR=true

View file

@ -36,7 +36,7 @@
"en": "Is it a public site ?", "en": "Is it a public site ?",
"fr": "Est-ce un site public ?" "fr": "Est-ce un site public ?"
}, },
"default": "true" "default": true
} }
] ]
} }

View file

@ -64,7 +64,7 @@ ynh_install_app_dependencies postgresql apt-transport-https
# Install Yarn # Install Yarn
ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg" ynh_install_extra_app_dependencies --repo="deb https://dl.yarnpkg.com/debian/ stable main" --package="yarn" --key="https://dl.yarnpkg.com/debian/pubkey.gpg"
ynh_install_nodejs 8 ynh_install_nodejs 10
#============================================== #==============================================
# CREATE DB # CREATE DB
@ -105,10 +105,23 @@ cp ../conf/.sequelizerc.example "$final_path"/.sequelizerc
#============================================== #==============================================
# INSTALL CODIMD # INSTALL CODIMD
#============================================== #==============================================
ynh_script_progression --message="Building application... (this may take some time and resources!)" ynh_script_progression --message="Building application... (this will take some time and resources!)"
pushd "$final_path" || exit pushd "$final_path" || exit
./bin/setup
# ---- This is copypasta from https://raw.githubusercontent.com/codimd/server/master/bin/setup
if [ ! -f config.json ]; then
cp config.json.example config.json
fi
if [ ! -f .sequelizerc ]; then
cp .sequelizerc.example .sequelizerc
fi
yarn install --non-interactive
yarn install --non-interactive --production=false # FIXME: this doesn't sounds like what we want to have for a real deployment ? idk
# ---- End copypasta from https://raw.githubusercontent.com/codimd/server/master/bin/setup
yarn run build yarn run build
#node_modules/.bin/sequelize db:migrate #node_modules/.bin/sequelize db:migrate
popd || exit popd || exit

View file

@ -128,7 +128,7 @@ ynh_install_extra_repo () {
local component="${repo##$uri $suite }" local component="${repo##$uri $suite }"
# Add the repository into sources.list.d # Add the repository into sources.list.d
ynh_add_repo --uri="$uri" --suite="$suite" --component="$component" --name="$name" "$append" ynh_add_repo --uri="$uri" --suite="$suite" --component="$component" --name="$name" $append
# Pin the new repo with the default priority, so it won't be used for upgrades. # Pin the new repo with the default priority, so it won't be used for upgrades.
# Build $pin from the uri without http and any sub path # Build $pin from the uri without http and any sub path
@ -139,7 +139,7 @@ ynh_install_extra_repo () {
then then
priority="--priority=$priority" priority="--priority=$priority"
fi fi
ynh_pin_repo --package="*" --pin="origin \"$pin\"" "$priority" --name="$name" "$append" ynh_pin_repo --package="*" --pin="origin \"$pin\"" "$priority" --name="$name" $append
# Get the public key for the repo # Get the public key for the repo
if [ -n "$key" ] if [ -n "$key" ]