Skip to content

Commit 14e677c

Browse files
committed
apm: remove occurrences of ${srcdir}
1 parent afea5f1 commit 14e677c

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed

apm/PKGBUILD

+8-4
Original file line numberDiff line numberDiff line change
@@ -41,24 +41,28 @@ build() {
4141
package() {
4242
cp -r "${srcdir}"/apm-build/usr "${pkgdir}"
4343

44-
cd "${pkgdir}"/usr/lib/node_modules/atom-package-manager
44+
_apmdir='/usr/lib/node_modules/atom-package-manager'
45+
46+
cd "${pkgdir}"${_apmdir}
4547
install -m644 "${srcdir}"/apm-${pkgver}/README.md ./
4648
patch -Np1 -i ${srcdir}/electron-version.patch
4749
patch -Np1 -i ${srcdir}/use-system-nodejs.patch
4850
rm bin/apm.cmd
4951

5052
# Fix location of Atom app
5153
sed -e 's|share/atom/resources/app.asar|lib/atom|g' \
52-
-i "${pkgdir}"/usr/lib/node_modules/atom-package-manager/lib/apm.js
54+
-i "${pkgdir}"${_apmdir}/lib/apm.js
5355

5456
# Install license file
5557
install -d -m755 "${pkgdir}/usr/share/licenses/${pkgname}"
5658
ln -s ../../../lib/node_modules/atom-package-manager/LICENSE.md \
5759
"${pkgdir}/usr/share/licenses/${pkgname}"
5860

59-
# Remove occurences of ${srcdir}
61+
# Remove occurrences of ${srcdir}
6062
find "${pkgdir}" -name "package.json" \
61-
-exec sed -e "s|${srcdir}/apm-build||" -i '{}' \;
63+
-exec sed -e "s|${srcdir}/apm-build||" \
64+
-e "s|${srcdir}/apm-${pkgver}|${_apmdir}|" \
65+
-i '{}' \;
6266

6367
# Remove useless stuff and use python2
6468
find "${pkgdir}"/usr/lib \

0 commit comments

Comments
 (0)