#6 Fix hard-coded output directory in nodejs-packaging-bundler
Merged 2 years ago by sgallagh. Opened 2 years ago by music.
rpms/ music/nodejs-packaging rhbz-1974709-srcdir  into  rawhide

file modified
+2 -2
@@ -1,5 +1,5 @@ 

  #!/bin/bash

- OUTPUT_DIR="${HOME}/rpmbuild/SOURCES"

+ OUTPUT_DIR="$(rpm -E '%{_sourcedir}')"

  

  usage() {

    echo "Usage `basename $0` <npm_name> [version] " >&2
@@ -90,6 +90,6 @@ 

    tar cfz ../${PACKAGE_SAFE}-${VERSION}-nm-dev.tgz node_modules_dev

  fi

  cd ..

- cp -v ${PACKAGE_SAFE}-${VERSION}* $HOME/rpmbuild/SOURCES

+ cp -v ${PACKAGE_SAFE}-${VERSION}* "${OUTPUT_DIR}"

  popd > /dev/null

  rm -rf ${TMP_DIR}

Evaluate the RPM %_sourcedir macro and use its value as the output directory for nodejs-packaging-bunder.

Fixes RHBZ#1974709.

LGTM, I will merge and build this once the CI finishes.

Pull-Request has been merged by sgallagh

2 years ago

Build failed. More information on how to proceed and troubleshoot errors available at https://fedoraproject.org/wiki/Zuul-based-ci

Metadata