From ac5c2fd09b6b612fe956ac40f8f90a0cd26881a9 Mon Sep 17 00:00:00 2001 From: Allan McRae Date: Wed, 9 Jun 2010 13:45:22 +1000 Subject: Fix creation of source packages Source packages were getting created with only links to local source files. Caused by commit 5cddcc90. Also, fix dangling symlinks to install and changelog files. Caused by commit fe1e3471. Thanks to Christopher Rogers for pointing out areas that were failing. Signed-off-by: Allan McRae --- scripts/makepkg.sh.in | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'scripts') diff --git a/scripts/makepkg.sh.in b/scripts/makepkg.sh.in index 8d6d1f63..86984db2 100644 --- a/scripts/makepkg.sh.in +++ b/scripts/makepkg.sh.in @@ -1096,7 +1096,7 @@ create_srcpackage() { for file in "${source[@]}"; do if [[ -f $file ]]; then msg2 "$(gettext "Adding %s...")" "$file" - ln -s "$file" "$srclinks/$pkgbase" + ln -s "${startdir}/$file" "$srclinks/$pkgbase" elif (( SOURCEONLY == 2 )); then local absfile=$(get_filepath "$file") || missing_source_file "$file" msg2 "$(gettext "Adding %s...")" "${absfile##*/}" @@ -1110,9 +1110,9 @@ create_srcpackage() { local file for file in ${!i}; do # evaluate any bash variables used - eval file='${srclinks}/${pkgbase}/'${file} - if [[ ! -f $file ]]; then - msg2 "$(gettext "Adding %s file (%s)...")" "$i" "${file##*/}" + eval file=${file} + if [[ ! -f "${srclinks}/${pkgbase}/$file" ]]; then + msg2 "$(gettext "Adding %s file (%s)...")" "$i" "${file}" ln -s "${startdir}/$file" "${srclinks}/${pkgbase}/" fi done -- cgit v1.2.3-70-g09d2