From cca36e0101ac1fcb3c38ad41b8d2fc045130485d Mon Sep 17 00:00:00 2001 From: tastytea Date: Tue, 17 Jan 2023 01:02:19 +0100 Subject: [PATCH] www-apps/misskey: keyword 13.0.0 for ~amd64 set up pnpm correctly Signed-off-by: tastytea --- www-apps/misskey/misskey-13.0.0.ebuild | 25 +++++++++++++++++-------- 1 file changed, 17 insertions(+), 8 deletions(-) diff --git a/www-apps/misskey/misskey-13.0.0.ebuild b/www-apps/misskey/misskey-13.0.0.ebuild index 3b81ca4..abce14b 100644 --- a/www-apps/misskey/misskey-13.0.0.ebuild +++ b/www-apps/misskey/misskey-13.0.0.ebuild @@ -22,13 +22,13 @@ SRC_URI=" # export CYPRESS_CACHE_FOLDER="$(realpath ./packages-cache)" # export npm_config_cache="$(realpath ./packages-cache)" # pnpm config set store-dir "$(realpath ./packages-cache)" -# pnpm install +# pnpm install --frozen-lockfile # tar -caf ${P}-deps.tar.xz packages-cache # unset CYPRESS_CACHE_FOLDER npm_config_cache LICENSE="GPL-3" SLOT="0" -# KEYWORDS="~amd64" +KEYWORDS="~amd64" IUSE="nginx +savedconfig source" REQUIRED_USE="savedconfig" @@ -56,15 +56,20 @@ QA_PREBUILT=" /opt/misskey/misskey/packages/client/node_modules/microtime/prebuilds/* " -pnpm() { - # use the pnpm from nodejs if it isn't available otherwise - if [[ -x /usr/bin/pnpm ]] > /dev/null 2>&1; then - /usr/bin/pnpm "${@}" - else - /usr/$(get_libdir)/node_modules/corepack/dist/pnpm.js "${@}" +setup_pnpm() { + # use the pnpm from nodejs if it isn't installed + if ! type pnpm > /dev/null 2>&1; then + mkdir "${T}"/bin || die "could not create dir in temporary directory" + ln -s /usr/$(get_libdir)/node_modules/corepack/dist/pnpm.js \ + "${T}"/bin/pnpm || die "could not create pnpm symlink" + PATH="${T}/bin:${PATH}" fi } +pkg_setup() { + setup_pnpm +} + src_unpack() { default mv --no-target-directory assets-${MY_COMMIT_ASSETS} ${P}/${PN}-assets \ @@ -131,6 +136,8 @@ pkg_preinst() { } pkg_postinst() { + setup_pnpm + # Only run migrations if database exists if su --login --command "psql misskey -c ''" postgres; then einfo "Running migration…" @@ -149,6 +156,8 @@ pkg_postinst() { } pkg_config() { + setup_pnpm + einfo "Initialising PostgreSQL database" echo -n "password for misskey user: " read -r MY_PASSWORD || die "Reading password failed"