rpms/nodejs-bash-language-server
4
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: rpms:rawhide
Branches Tags
rpms:rawhide
rpms:f43
rpms:main
rpms:f40
rpms:f41
rpms:f42
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34
..
compare: rpms:f37
Branches Tags
rpms:f43
rpms:main
rpms:rawhide
rpms:f40
rpms:f41
rpms:f42
rpms:f39
rpms:f38
rpms:f37
rpms:f36
rpms:f35
rpms:f34

5 commits
rawhide ... f37

Author SHA1 Message Date
Pavel Filipenský
6a2fd2bb89 Don't own /usr/lib/node_modules 
resolves: rhbz#2176048

As part of https://fedoraproject.org/wiki/Changes/NodejsRepackaging,
the path `/usr/lib/node_modules` has been changed from a directory to a
symlink. This causes a file conflict when trying to install this
package in Fedora 38.

Stop owning that path; it's already owned by Node.js. This is consistent
with other packaged Node.js apps I've manually checked.
 2023-03-07 15:29:19 +01:00
Pavel Filipenský
b3820356f1 Fix /usr/bin/bash-language-server 
Need to fix a broken link:

$ ll /usr/bin/bash-language-server
lrwxrwxrwx 1 root root 54 Jan 30 13:15 /usr/bin/bash-language-server -> /usr/lib/node_modules/bash-language-server/bin/main.js
$ ll /usr/lib/node_modules/bash-language-server/bin/main.js
ls: cannot access '/usr/lib/node_modules/bash-language-server/bin/main.js': No such file or directory
 2023-02-02 20:46:23 +01:00
Pavel Filipenský
e3b04d6e5f Update to version 4.6.1 2023-01-30 13:08:46 +01:00
Pavel Filipenský
3700191313 Update to version 3.2.0 2022-11-28 09:47:45 +01:00
Pavel Filipenský
0ee266a745 Update to version 3.0.5 2022-08-19 12:23:55 +02:00
6 changed files with 98 additions and 145 deletions
Download patch file Download diff file Expand all files Collapse all files

12
.gitignore vendored
View file

@ -8,15 +8,3 @@
/bash-language-server-3.2.0-vendor.tar.xz /bash-language-server-3.2.0-vendor.tar.xz
/bash-language-server-4.6.1.tar.gz /bash-language-server-4.6.1.tar.gz
/bash-language-server-4.6.1-vendor.tar.xz /bash-language-server-4.6.1-vendor.tar.xz
/bash-language-server-4.10.0-vendor.tar.xz
/bash-language-server-4.10.0.tar.gz
/bash-language-server-5.1.1.tar.gz
/bash-language-server-5.1.1-vendor.tar.zst
/bash-language-server-5.2.0.tar.gz
/bash-language-server-5.2.0-vendor.tar.zst
/bash-language-server-5.4.0.tar.gz
/bash-language-server-5.4.0-vendor.tar.zst
/bash-language-server-5.4.3.tar.gz
/bash-language-server-5.4.3-vendor.tar.zst
/bash-language-server-5.6.0.tar.gz
/bash-language-server-5.6.0-vendor.tar.zst

3
bash-language-server-bundled-licenses.txt
View file

@ -1,3 +0,0 @@
"BSD-2-Clause"
"ISC"
"MIT"

52
changelog
View file

@ -1,52 +0,0 @@
* Thu Jan 25 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Sun Jan 21 2024 Fedora Release Engineering <releng@fedoraproject.org> - 5.1.1-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
* Tue Jan 02 2024 Andreas Schneider <asn@redhat.com> - 5.1.1-1
- Update to version 5.1.1
* https://github.com/bash-lsp/bash-language-server/blob/server-5.1.1/server/CHANGELOG.md
* Thu Jul 20 2023 Fedora Release Engineering <releng@fedoraproject.org> - 4.10.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
* Mon Jun 12 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.10-1
- Update to version 4.10.0 - https://github.com/bash-lsp/bash-language-server/blob/server-4.10.0/server/CHANGELOG.md
* Thu Feb 02 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-2
- Fix /usr/bin/bash-language-server
* Mon Jan 30 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-1
- Update to version 4.6.1
* https://github.com/bash-lsp/bash-language-server/blob/server-4.6.1/server/CHANGELOG.md
* Sun Jan 29 2023 Jonathan Lebon <jonathan@jlebon.com> - 3.2.0-3
- Don't own /usr/lib/node_modules
* Thu Jan 19 2023 Fedora Release Engineering <releng@fedoraproject.org> - 3.2.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
* Fri Aug 19 2022 Pavel Filipenský <pfilipen@redhat.com> - 3.0.5-1
- Update to version 3.0.5
* https://github.com/bash-lsp/bash-language-server/blob/server-3.0.5/server/CHANGELOG.md
- Linting based on shellcheck
- Update bashls-fix-CVE-2022-0613.patch with content of https://patch-diff.githubusercontent.com/raw/bash-lsp/bash-language-server/pull/489.patch
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Feb 17 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-3
- resolves: #2055544 - Fix CVE-2022-0613
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Aug 26 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-1
- Update to version 2.0.0
* https://github.com/bash-lsp/bash-language-server/blob/server-2.0.0/server/CHANGELOG.md
- Fixed indentation for node shebang loop
* Thu Aug 05 2021 Andreas Schneider <asn@redhat.com> - 1.17.0-1
- Initial package

101
nodejs-bash-language-server.spec
View file

@ -3,22 +3,21 @@
%define pkg_name bash-language-server %define pkg_name bash-language-server
Name: nodejs-bash-language-server Name: nodejs-bash-language-server
Version: 5.6.0 Version: 4.6.1
Release: %autorelease Release: 3%{?dist}
Summary: A language server for Bash Summary: A language server for Bash
License: MIT License: MIT
Url: https://github.com/bash-lsp/bash-language-server Url: https://github.com/bash-lsp/bash-language-server
Source0: %{url}/archive/server-%{version}/%{pkg_name}-%{version}.tar.gz Source0: %{url}/archive/server-%{version}/%{pkg_name}-%{version}.tar.gz
# Create with `bash prepare_vendor.sh` # Create with `bash prepare_vendor.sh`
Source1: %{pkg_name}-%{version}-vendor.tar.zst Source1: %{pkg_name}-%{version}-vendor.tar.xz
# Create with: nodejs-packaging-bundler bash-language-server 5.1.1
Source2: bash-language-server-bundled-licenses.txt
BuildRequires: fdupes BuildRequires: fdupes
BuildRequires: npm(typescript) BuildRequires: nodejs-typescript
BuildRequires: nodejs-packaging BuildRequires: nodejs-packaging
BuildRequires: nodejs-npm BuildRequires: npm
BuildRequires: perl-interpreter BuildRequires: perl-interpreter
BuildRequires: pnpm BuildRequires: rsync
BuildRequires: yarnpkg
BuildArch: noarch BuildArch: noarch
ExclusiveArch: %{nodejs_arches} noarch ExclusiveArch: %{nodejs_arches} noarch
Recommends: ShellCheck Recommends: ShellCheck
@ -30,20 +29,21 @@ Bash with explainshell integration.
%prep %prep
%autosetup -n %{pkg_name}-server-%{version} -a1 -p1 %autosetup -n %{pkg_name}-server-%{version} -a1 -p1
cp %{SOURCE2} .
%build %build
pnpm install --offline --frozen-lockfile --store-dir="$(pwd)/.pnpm-store" export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
yarn install --offline --frozen-lockfile
npm run compile npm run compile
%install %install
export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
# Only install production dependencies in node_modules # Only install production dependencies in node_modules
rm -rf node_modules/ yarn install --production --offline --frozen-lockfile
pnpm install --production --offline --frozen-lockfile --package-import-method copy --store-dir="$(pwd)/.pnpm-store"
for S in $(grep -l '#!.*node' \ for S in $(grep -l '#!.*node' \
server/out/cli.js \ server/bin/* \
server/node_modules/acorn/bin/* \
server/node_modules/ajv/scripts/* \ server/node_modules/ajv/scripts/* \
server/node_modules/escodegen/bin/* \ server/node_modules/escodegen/bin/* \
server/node_modules/esprima/bin/* \ server/node_modules/esprima/bin/* \
@ -53,51 +53,72 @@ for S in $(grep -l '#!.*node' \
server/node_modules/uuid/bin/* \ server/node_modules/uuid/bin/* \
server/node_modules/vscode-languageserver/bin/* \ server/node_modules/vscode-languageserver/bin/* \
) ; do ) ; do
SB="${S}.backup" SB="${S}.backup"
cp ${S} ${SB} cp ${S} ${SB}
perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S perl -p -i -e 's|#!/usr/bin/env node|#!%{_bindir}/node|g' $S
diff -urN ${SB} ${S} || : diff -urN ${SB} ${S} || :
rm ${SB} rm ${SB}
done done
install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
cp -av server %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
cp -av node_modules %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
install -d -m 0755 %{buildroot}%{_bindir} install -d -m 0755 %{buildroot}%{_bindir}
cat << EOF > %{buildroot}%{_bindir}/%{pkg_name} cat << EOF > %{buildroot}%{_bindir}/%{pkg_name}
#!/bin/sh #!/bin/sh
export NODE_ENV=production export NODE_ENV=production
exec /usr/bin/node %{nodejs_sitelib}/%{pkg_name}/server/out/cli.js "\$@" exec /usr/bin/node %{nodejs_sitelib}/%{pkg_name}/out/cli.js "\$@"
EOF EOF
chmod +x %{buildroot}%{_bindir}/%{pkg_name} chmod +x %{buildroot}%{_bindir}/%{pkg_name}
install -d -m 0755 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
rsync -av server/ %{buildroot}%{nodejs_sitelib}/%{pkg_name}/
rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/performance-now/test/
chmod 0644 %{buildroot}%{nodejs_sitelib}/%{pkg_name}/tree-sitter-bash.wasm \
%{buildroot}%{nodejs_sitelib}/%{pkg_name}/node_modules/web-tree-sitter/tree-sitter.wasm
find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -name "*.bak" -delete find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -name "*.bak" -delete
find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type f -name "\.*" -delete
find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type d -name "\.bin" -print0 | xargs -0 rm -rf
find %{buildroot}%{nodejs_sitelib}/%{pkg_name} -type d -name "\.github" -print0 | xargs -0 rm -rf
rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/ajv/scripts/
rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/dashdash/etc/
rm -rf %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/performance-now/test/
rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/src/get-options.sh
# dangling symlinks
rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/fuzzy-search
rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/node-fetch
rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/turndown
rm %{buildroot}%{nodejs_sitelib}/%{pkg_name}/server/node_modules/@types/urijs
%fdupes %{buildroot}%{nodejs_sitelib}/%{pkg_name} %fdupes %{buildroot}%{nodejs_sitelib}/%{pkg_name}
%files %files
%license LICENSE bash-language-server-bundled-licenses.txt %license LICENSE
%doc README.md %doc README.md
%{_bindir}/%{pkg_name} %{_bindir}/%{pkg_name}
%{nodejs_sitelib}/%{pkg_name}/ %{nodejs_sitelib}/%{pkg_name}/
%changelog %changelog
%autochangelog * Tue Mar 07 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-3
- resolves: rhbz#2176048 - Don't own /usr/lib/node_modules
* Thu Feb 02 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-2
- Fix /usr/bin/bash-language-server
* Mon Jan 30 2023 Pavel Filipenský <pfilipen@redhat.com> - 4.6.1-1
- Update to version 4.6.1
* https://github.com/bash-lsp/bash-language-server/blob/server-4.6.1/server/CHANGELOG.md
* Fri Aug 19 2022 Pavel Filipenský <pfilipen@redhat.com> - 3.0.5-1
- Update to version 3.0.5
* https://github.com/bash-lsp/bash-language-server/blob/server-3.0.5/server/CHANGELOG.md
- Linting based on shellcheck
- Update bashls-fix-CVE-2022-0613.patch with content of https://patch-diff.githubusercontent.com/raw/bash-lsp/bash-language-server/pull/489.patch
* Fri Jul 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-4
- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
* Thu Feb 17 2022 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-3
- resolves: #2055544 - Fix CVE-2022-0613
* Thu Jan 20 2022 Fedora Release Engineering <releng@fedoraproject.org> - 2.0.0-2
- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
* Thu Aug 26 2021 Pavel Filipenský <pfilipen@redhat.com> - 2.0.0-1
- Update to version 2.0.0
* https://github.com/bash-lsp/bash-language-server/blob/server-2.0.0/server/CHANGELOG.md
- Fixed indentation for node shebang loop
* Thu Aug 05 2021 Andreas Schneider <asn@redhat.com> - 1.17.0-1
- Initial package

71
prepare_vendor.sh
View file

@ -1,23 +1,22 @@
#!/bin/bash #!/bin/bash
# shellcheck disable=2181
BASHLS_URL="$(rpmspec -P ./*.spec | grep Source0 | sed -e 's/Source0:[ ]*//g')" BASHLS_URL=$(rpmspec -P *.spec | grep Source0 | sed -e 's/Source0:[ ]*//g')
BASHLS_TARBALL="$(basename "${BASHLS_URL}")" BASHLS_TARBALL=$(basename $BASHLS_URL)
BASHLS_PKGVERSION="$(rpmspec -P ./*.spec | grep ^Version | sed -e 's/Version:[ ]*//g')" BASHLS_PKGVERSION=$(rpmspec -P *.spec | grep ^Version | sed -e 's/Version:[ ]*//g')
BASHLS_PKGNAME="bash-language-server" BASHLS_PKGNAME="bash-language-server"
BASHLS_PKGDIR="$(pwd)" BASHLS_PKGDIR="$(pwd)"
BASHLS_TMPDIR="$(mktemp --tmpdir -d bashls-XXXXXXXX)" BASHLS_TMPDIR=$(mktemp --tmpdir -d bashls-XXXXXXXX)
BASHLS_PATH="${BASHLS_TMPDIR}/${BASHLS_PKGNAME}-server-${BASHLS_PKGVERSION}" BASHLS_PATH="$BASHLS_TMPDIR/$BASHLS_PKGNAME-server-$BASHLS_PKGVERSION"
echo "URL: ${BASHLS_URL}" echo "URL: $BASHLS_URL"
echo "TARBALL: ${BASHLS_TARBALL}" echo "TARBALL: $BASHLS_TARBALL"
echo "NAME: ${BASHLS_PKGNAME}" echo "NAME: $BASHLS_PKGNAME"
echo "VERSION: ${BASHLS_PKGVERSION}" echo "VERSION: $BASHLS_PKGVERSION"
echo "PATH: ${BASHLS_PATH}" echo "PATH: $BASHLS_PATH"
cleanup_tmpdir() { cleanup_tmpdir() {
popd 2>/dev/null || true popd 2>/dev/null
rm -rf "${BASHLS_TMPDIR}" rm -rf $BASHLS_TMPDIR
} }
trap cleanup_tmpdir SIGINT trap cleanup_tmpdir SIGINT
@ -30,56 +29,56 @@ cleanup_and_exit() {
fi fi
} }
if [ ! -w "${BASHLS_TARBALL}" ]; then if [ ! -w "$BASHLS_TARBALL" ]; then
wget "$BASHLS_URL" wget "$BASHLS_URL"
fi fi
tar -xf "${BASHLS_TARBALL}" -C "${BASHLS_TMPDIR}" tar -xf $BASHLS_TARBALL -C $BASHLS_TMPDIR
pushd "${BASHLS_PATH}" || cleanup_and_exit 1 pushd $BASHLS_PATH || cleanup_and_exit 1
PNPM_STORE_DIR="$(pwd)/.pnpm-store" export YARN_CACHE_FOLDER="$(pwd)/.package-cache"
echo ">>>>>> Install npm modules" echo ">>>>>> Install npm modules"
pnpm install --store-dir="${PNPM_STORE_DIR}" yarn install --frozen-lockfile
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
echo "ERROR: yarn install failed" echo "ERROR: yarn install failed"
cleanup_and_exit 1 cleanup_and_exit 1
fi fi
echo ">>>>>> Cleanup object dirs" echo ">>>>>> Cleanup object dirs"
find "${PNPM_STORE_DIR}/" -type d -name "__pycache__" -print0 | xargs -0 rm -rf find ${YARN_CACHE_FOLDER}/ -type d -name "*.o.d" | xargs rm -rf
find "${PNPM_STORE_DIR}/" -type d -name "*.o.d" -print0 | xargs -0 rm -rf find ${YARN_CACHE_FOLDER}/ -type d -name "__pycache__" | xargs rm -rf
echo ">>>>>> Cleanup object files" echo ">>>>>> Cleanup object files"
find "${PNPM_STORE_DIR}/" -name "*.node" -print0 | xargs -0 rm -rf find ${YARN_CACHE_FOLDER}/ -name "*.node" | xargs rm -rf
find "${PNPM_STORE_DIR}/" -name "*.dll" | grep -v signal-client | xargs rm -f find ${YARN_CACHE_FOLDER}/ -name "*.dll" | grep -v signal-client | xargs rm -f
find "${PNPM_STORE_DIR}/" -name "*.dylib" -delete find ${YARN_CACHE_FOLDER}/ -name "*.dylib" -delete
find "${PNPM_STORE_DIR}/" -name "*.so" -delete find ${YARN_CACHE_FOLDER}/ -name "*.so" -delete
find "${PNPM_STORE_DIR}/" -name "*.o" -delete find ${YARN_CACHE_FOLDER}/ -name "*.o" -delete
find "${PNPM_STORE_DIR}/" -name "*.a" -delete find ${YARN_CACHE_FOLDER}/ -name "*.a" -delete
find "${PNPM_STORE_DIR}/" -name "*.snyk-*.flag" -delete find ${YARN_CACHE_FOLDER}/ -name "*.snyk-*.flag" -delete
find "${PNPM_STORE_DIR}/" -name "builderror.log" -delete find ${YARN_CACHE_FOLDER}/ -name "builderror.log" -delete
find "${PNPM_STORE_DIR}/" -name ".deps" -type d -print0 | xargs -0 rm -rf find ${YARN_CACHE_FOLDER}/ -name ".deps" -type d | xargs rm -rf
echo ">>>>>> Cleanup build info" echo ">>>>>> Cleanup build info"
find "${PNPM_STORE_DIR}/" -name "Makefile" -delete find ${YARN_CACHE_FOLDER}/ -name "Makefile" -delete
find "${PNPM_STORE_DIR}/" -name "*.target.mk" -delete find ${YARN_CACHE_FOLDER}/ -name "*.target.mk" -delete
find "${PNPM_STORE_DIR}/" -name "config.gypi" -delete find ${YARN_CACHE_FOLDER}/ -name "config.gypi" -delete
find "${PNPM_STORE_DIR}/" -name "package.json" -exec sed -i "s#${BASHLS_PATH}#/tmp#g" {} \; find ${YARN_CACHE_FOLDER}/ -name "package.json" -exec sed -i "s#$BASHLS_PATH#/tmp#g" {} \;
echo ">>>>>> Package vendor files" echo ">>>>>> Package vendor files"
rm -f "${BASHLS_PKGDIR}/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.zst" rm -f $BASHLS_PKGDIR/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.xz
XZ_OPT="-T$(nproc)" tar --zstd -cf "${BASHLS_PKGDIR}/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.zst" .pnpm-store XZ_OPT="-T$(nproc)" tar cJf $BASHLS_PKGDIR/${BASHLS_PKGNAME}-${BASHLS_PKGVERSION}-vendor.tar.xz .package-cache
if [ $? -ne 0 ]; then if [ $? -ne 0 ]; then
cleanup_and_exit 1 cleanup_and_exit 1
fi fi
popd || cleanup_and_exit 1 popd
cleanup_and_exit 0 cleanup_and_exit 0

4
sources
View file

@ -1,2 +1,2 @@
SHA512 (bash-language-server-5.6.0.tar.gz) = 0c99d34ca0e92a4e5719e8c8ca99faad5effe5d6d45f72cdaa05f70df521cf0830e3f81acf700d172496afa721881c2f1df4faf280e897809ce55757d5039796 SHA512 (bash-language-server-4.6.1.tar.gz) = 64f6e9f80ddf6b6cd4c6153b04490b1f91f0a57d2a472dadf8f55691952fe7c8907cba98d01e24ae8dfb761d3c3eb7bb7bd8623ff637ae723dac3b8e56870610
SHA512 (bash-language-server-5.6.0-vendor.tar.zst) = ea90b1ea6fd23bbd18ff1346f3b22813a0c5a38c0f3c36b58dbebe64d2dd1f449ae9e1ea5ca516124d8a7bf7f327d2062cbf7fb17ccdf424489a29eb14a71560 SHA512 (bash-language-server-4.6.1-vendor.tar.xz) = 521dd2c863ba02f1a41f666e43dc0c4763bb4c12c61b9eeb6c8efee04ef2003c92f5137eba186545af60b8bbdc15b10b183464c55a5088e046da25a803c96e7b