чување 0fa51d3e0d5ab110db7fa9f7b39960ddbb899ea1
родитељ c263ae396168ead5e5470be06079eccc036af488
Аутор: Страхиња Радић <contact@strahinja.org>
Датум: Thu, 4 Aug 2022 14:50:28 +0200
Remove braces
Signed-off-by: Страхиња Радић <contact@strahinja.org>
Diffstat:
измењених датотека: 11, додавања: 148(+), брисања: 147(-)
diff --git a/config.mk b/config.mk
@@ -1,3 +1,4 @@
PREFIX=/
-LIBDIR=${DESTDIR}${PREFIX}/lib/mkpk
+BINDIR=$DESTDIR/bin
+LIBDIR=$DESTDIR/lib/mkpk
PKG=mkpk
diff --git a/lib/build.mk b/lib/build.mk
@@ -1,14 +1,14 @@
<$mkpklib/defaults.mk
build-package:QV:
- recentver=$(find ${SRCBASEDIR}/* -type d -prune -name "${PKGBASE}-*" | \
+ recentver=$(find $SRCBASEDIR/* -type d -prune -name "$PKGBASE-*" | \
sed 's,\([^0-9]\+[^-]-\)\+\([0-9].*\),\2,' | recent)
- if [ -z "${recentver}" ]; then
+ if [ -z "$recentver" ]; then
printf "Directory %s does not exist (try fetch?)" \
- "${PKGBASE}" >&2
+ "$PKGBASE" >&2
exit 1
fi
- found=${SRCBASEDIR}/${PKGBASE}-${recentver}
- cp -R "${SRCMKFILES}/${PKGBASE}"/* "${found}/"
- cd "${found}"
- "${MK}" package-install
+ found=$SRCBASEDIR/$PKGBASE-$recentver
+ cp -R "$SRCMKFILES/$PKGBASE"/* "$found/"
+ cd "$found"
+ "$MK" package-install
diff --git a/lib/c.targets.mk b/lib/c.targets.mk
@@ -1,7 +1,7 @@
-%.o:Q: %.c ${ODEPS}
- printf " CC\t%s\n" ${stem}.c
- ${CC} ${CFLAGS} -o ${stem}.o -c ${stem}.c
+%.o:Q: %.c $ODEPS
+ printf " CC\t%s\n" $stem.c
+ $CC $CFLAGS -o $stem.o -c $stem.c
-$BIN:Q: ${OBJ}
- printf " LD\t%s\n" ${target}
- ${LD} ${LDFLAGS} -o ${target} ${OBJ} ${LIBS}
+$BIN:Q: $OBJ
+ printf " LD\t%s\n" $target
+ $LD $LDFLAGS -o $target $OBJ $LIBS
diff --git a/lib/defaults.mk b/lib/defaults.mk
@@ -1,12 +1,12 @@
#DESTDIR= # Automatically ignored if empty
-PREFIX= `{ if [ -n "${PREFIX}" ]; then echo ${PREFIX}; \
+PREFIX= `{ if [ -n "$PREFIX" ]; then echo $PREFIX; \
else echo /local; fi }
-BINDIR= `{ if [ -n "${BINDIR}" ]; then echo ${BINDIR}; \
- else echo ${DESTDIR}${PREFIX}/bin; fi }
-LIBDIR= `{ if [ -n "${LIBDIR}" ]; then echo ${LIBDIR}; \
- else echo ${DESTDIR}${PREFIX}/lib; fi }
-MANDIR= `{ if [ -n "${MANDIR}" ]; then echo ${MANDIR}; \
- else echo ${DESTDIR}${PREFIX}/share/man; fi }
+BINDIR= `{ if [ -n "$BINDIR" ]; then echo $BINDIR; \
+ else echo $DESTDIR$PREFIX/bin; fi }
+LIBDIR= `{ if [ -n "$LIBDIR" ]; then echo $LIBDIR; \
+ else echo $DESTDIR$PREFIX/lib; fi }
+MANDIR= `{ if [ -n "$MANDIR" ]; then echo $MANDIR; \
+ else echo $DESTDIR$PREFIX/share/man; fi }
DOCDIR= /share/doc/$PKG
LEGALDIR= /share/legal/$PKG
diff --git a/lib/info.mk b/lib/info.mk
@@ -1,32 +1,32 @@
<$mkpklib/defaults.mk
show-info:QV:
- record=$(grep "^${PKGBASE}\t" "${PKGDB}" 2>/dev/null || echo '')
- if [ -z "${record}" ]; then
- printf "Package %s is not installed\n" "${PKGBASE}" >&2
+ record=$(grep "^$PKGBASE\t" "$PKGDB" 2>/dev/null || echo '')
+ if [ -z "$record" ]; then
+ printf "Package %s is not installed\n" "$PKGBASE" >&2
exit 1
fi
- ver=$(echo "${record}" | cut -f2)
- if [ -z "${ver}" ]; then
+ ver=$(echo "$record" | cut -f2)
+ if [ -z "$ver" ]; then
printf "Corrupted record for %s in %s\n" \
- "${PKGBASE}" "${PKGDB}" >&2
+ "$PKGBASE" "$PKGDB" >&2
exit 1
else
- date=$(echo "${record}" | cut -f3)
- pkg=${PKGDIR}/${PKGBASE}-${ver}.tar.xz
+ date=$(echo "$record" | cut -f3)
+ pkg=$PKGDIR/$PKGBASE-$ver.tar.xz
total=$(cd /; echo "$({ printf "("
- for file in $(xz -dc ${pkg} | tar -tf -); do
- stat ${file} | \
+ for file in $(xz -dc $pkg | tar -tf -); do
+ stat $file | \
sed '/^\s*Size:/s/\s*Size: \([0-9]\+\).*/\1+/;t;d'
done | tr '\n' ' '
printf "0)"
})" | bc)
- tarballsize=$(stat ${pkg} | \
+ tarballsize=$(stat $pkg | \
sed '/^\s*Size:/s/\s*Size: \([0-9]\+\).*/\1/;t;d')
- printf "Package:\t\t%s\n" "${PKGBASE}"
- printf "Version:\t\t%s\n" "${ver}"
- printf "Installation Date:\t%s\n" "${date}"
- printf "Tarball:\t\t%s\n" "${pkg}"
- printf "Installed Size:\t\t%s\n" "${total} bytes"
- printf "Tarball Size:\t\t%s\n" "${tarballsize} bytes"
+ printf "Package:\t\t%s\n" "$PKGBASE"
+ printf "Version:\t\t%s\n" "$ver"
+ printf "Installation Date:\t%s\n" "$date"
+ printf "Tarball:\t\t%s\n" "$pkg"
+ printf "Installed Size:\t\t%s\n" "$total bytes"
+ printf "Tarball Size:\t\t%s\n" "$tarballsize bytes"
fi
diff --git a/lib/install.mk b/lib/install.mk
@@ -1,20 +1,20 @@
<$mkpklib/defaults.mk
install-package:QV:
- recentver=$(find ${PKGDIR}/ -type f -prune -name "${PKGBASE}-*.tar.xz" \
+ recentver=$(find $PKGDIR/ -type f -prune -name "$PKGBASE-*.tar.xz" \
| sed 's,\([^0-9]\+[^-]-\)\+\([0-9].*\)\.tar\.xz,\2,' | recent)
- if [ -z "${recentver}" ]; then
- printf "Cannot find package %s\n" "${PKGBASE}" >&2
+ if [ -z "$recentver" ]; then
+ printf "Cannot find package %s\n" "$PKGBASE" >&2
exit 1
- elif [ -n "$(grep "^${PKGBASE}\t" "${PKGDB}" 2>/dev/null)" ]; then
- printf "Package %s already installed\n" "${PKGBASE}" >&2
+ elif [ -n "$(grep "^$PKGBASE\t" "$PKGDB" 2>/dev/null)" ]; then
+ printf "Package %s already installed\n" "$PKGBASE" >&2
exit 1
else
- pkg=${PKGDIR}/${PKGBASE}-${recentver}.tar.xz
+ pkg=$PKGDIR/$PKGBASE-$recentver.tar.xz
cd /
- printf " TAR\t%s\n" "${pkg}"
- xz -dc "${pkg}" | tar -xf - 2>/dev/null
- printf " UPD\t%s\n" "${PKGDB}"
- printf "%s\t%s\t%s\n" "${PKGBASE}" "${recentver}" \
- "$(date +'%Y-%m-%d %T')" >>"${PKGDB}"
+ printf " TAR\t%s\n" "$pkg"
+ xz -dc "$pkg" | tar -xf - 2>/dev/null
+ printf " UPD\t%s\n" "$PKGDB"
+ printf "%s\t%s\t%s\n" "$PKGBASE" "$recentver" \
+ "$(date +'%Y-%m-%d %T')" >>"$PKGDB"
fi
diff --git a/lib/listfiles.mk b/lib/listfiles.mk
@@ -1,17 +1,17 @@
<$mkpklib/defaults.mk
listfiles:QV:
- record=$(grep "^${PKGBASE}\t" "${PKGDB}" 2>/dev/null || echo '')
- if [ -z "${record}" ]; then
- printf "Package %s is not installed\n" "${PKGBASE}" >&2
+ record=$(grep "^$PKGBASE\t" "$PKGDB" 2>/dev/null || echo '')
+ if [ -z "$record" ]; then
+ printf "Package %s is not installed\n" "$PKGBASE" >&2
exit 1
fi
- ver=$(echo "${record}" | cut -f2)
- if [ -z "${ver}" ]; then
+ ver=$(echo "$record" | cut -f2)
+ if [ -z "$ver" ]; then
printf "Corrupted record for %s in %s\n" \
- "${PKGBASE}" "${PKGDB}" >&2
+ "$PKGBASE" "$PKGDB" >&2
exit 1
else
- pkg=${PKGDIR}/${PKGBASE}-${ver}.tar.xz
- xz -dc "${pkg}" | tar -tf -
+ pkg=$PKGDIR/$PKGBASE-$ver.tar.xz
+ xz -dc "$pkg" | tar -tf -
fi
diff --git a/lib/package.mk b/lib/package.mk
@@ -1,20 +1,20 @@
package:QV:
printf " MK\t%s\n" "clean"
- "${MK}" clean
+ "$MK" clean
printf " MK\t%s\n" "DESTDIR=pkgroot install"
- "${MK}" DESTDIR=pkgroot install
+ "$MK" DESTDIR=pkgroot install
printf " PROOT\t%s\n" pkgroot
- "${PROOT}" -r pkgroot -0 -b /bin/tar -b /bin/xz -b /etc -w / tar -cJnf \
- ${PKG}.tar.xz $(cd pkgroot; find . | sort | uniq | \
+ "$PROOT" -r pkgroot -0 -b /bin/tar -b /bin/xz -b /etc -w / tar -cJnf \
+ $PKG.tar.xz $(cd pkgroot; find . | sort | uniq | \
sed 's,^\./,,;s,^\.$,,')
- printf " MV\t%s\n" ${PKG}.tar.xz
- mv pkgroot/${PKG}.tar.xz .
- "${SHA512SUM}" ${PKG}.tar.xz > ${PKG}.sha512
+ printf " MV\t%s\n" $PKG.tar.xz
+ mv pkgroot/$PKG.tar.xz .
+ "$SHA512SUM" $PKG.tar.xz > $PKG.sha512
printf " RM\t%s\n" pkgroot
rm -rf pkgroot
package-install:QV: package
- printf " INST\t%s\n" ${PKG}.tar.xz
- "${INSTALL}" -Dm0644 ${PKG}.tar.xz ${PKGDIR}/${PKG}.tar.xz
- printf " INST\t%s\n" ${PKG}.sha512
- "${INSTALL}" -Dm0644 ${PKG}.sha512 ${PKGDIR}/${PKG}.sha512
+ printf " INST\t%s\n" $PKG.tar.xz
+ "$INSTALL" -Dm0644 $PKG.tar.xz $PKGDIR/$PKG.tar.xz
+ printf " INST\t%s\n" $PKG.sha512
+ "$INSTALL" -Dm0644 $PKG.sha512 $PKGDIR/$PKG.sha512
diff --git a/lib/standard.mk b/lib/standard.mk
@@ -4,86 +4,86 @@ doc:QV: $MAN1 $MAN2 $MAN3 $MAN4 $MAN5 $MAN6 $MAN7 $MAN8
%.gz:Q: %
printf " GZIP\t%s\n" $stem
- ${GZ} ${GZARGS} $stem >$stem.gz
+ $GZ $GZARGS $stem >$stem.gz
clean:QV:
- for junkitem in ${JUNK}; do
- printf " RM\t%s\n" "${junkitem}"
- rm -f ${junkitem}
+ for junkitem in $JUNK; do
+ printf " RM\t%s\n" "$junkitem"
+ rm -f $junkitem
done
install:QV: all
- for binary in ${BIN} ${SCRIPTS}; do
- printf " INST\t%s\n" "${binary}"
- $INSTALL -Dm0755 "${binary}" "${BINDIR}/${binary}"
+ for binary in $BIN $SCRIPTS; do
+ printf " INST\t%s\n" "$binary"
+ $INSTALL -Dm0755 "$binary" "$BINDIR/$binary"
done
- for manpage in ${MAN1}; do
- printf " INST\t%s\n" "${manpage}"
- $INSTALL -Dm644 "${manpage}" "${MANDIR}/man1/${manpage}"
+ for manpage in $MAN1; do
+ printf " INST\t%s\n" "$manpage"
+ $INSTALL -Dm644 "$manpage" "$MANDIR/man1/$manpage"
done
- for manpage in ${MAN2}; do
- printf " INST\t%s\n" "${manpage}"
- $INSTALL -Dm644 "${manpage}" "${MANDIR}/man2/${manpage}"
+ for manpage in $MAN2; do
+ printf " INST\t%s\n" "$manpage"
+ $INSTALL -Dm644 "$manpage" "$MANDIR/man2/$manpage"
done
- for manpage in ${MAN3}; do
- printf " INST\t%s\n" "${manpage}"
- $INSTALL -Dm644 "${manpage}" "${MANDIR}/man3/${manpage}"
+ for manpage in $MAN3; do
+ printf " INST\t%s\n" "$manpage"
+ $INSTALL -Dm644 "$manpage" "$MANDIR/man3/$manpage"
done
- for manpage in ${MAN4}; do
- printf " INST\t%s\n" "${manpage}"
- $INSTALL -Dm644 "${manpage}" "${MANDIR}/man4/${manpage}"
+ for manpage in $MAN4; do
+ printf " INST\t%s\n" "$manpage"
+ $INSTALL -Dm644 "$manpage" "$MANDIR/man4/$manpage"
done
- for manpage in ${MAN5}; do
- printf " INST\t%s\n" "${manpage}"
- $INSTALL -Dm644 "${manpage}" "${MANDIR}/man5/${manpage}"
+ for manpage in $MAN5; do
+ printf " INST\t%s\n" "$manpage"
+ $INSTALL -Dm644 "$manpage" "$MANDIR/man5/$manpage"
done
- for manpage in ${MAN6}; do
- printf " INST\t%s\n" "${manpage}"
- $INSTALL -Dm644 "${manpage}" "${MANDIR}/man6/${manpage}"
+ for manpage in $MAN6; do
+ printf " INST\t%s\n" "$manpage"
+ $INSTALL -Dm644 "$manpage" "$MANDIR/man6/$manpage"
done
- for manpage in ${MAN7}; do
- printf " INST\t%s\n" "${manpage}"
- $INSTALL -Dm644 "${manpage}" "${MANDIR}/man7/${manpage}"
+ for manpage in $MAN7; do
+ printf " INST\t%s\n" "$manpage"
+ $INSTALL -Dm644 "$manpage" "$MANDIR/man7/$manpage"
done
- for manpage in ${MAN8}; do
- printf " INST\t%s\n" "${manpage}"
- $INSTALL -Dm644 "${manpage}" "${MANDIR}/man8/${manpage}"
+ for manpage in $MAN8; do
+ printf " INST\t%s\n" "$manpage"
+ $INSTALL -Dm644 "$manpage" "$MANDIR/man8/$manpage"
done
uninstall:QV:
- for binary in ${BIN} ${SCRIPTS}; do
- printf " RM\t%s\n" "${BINDIR}/${binary}"
- rm -f "${BINDIR}/${binary}"
+ for binary in $BIN $SCRIPTS; do
+ printf " RM\t%s\n" "$BINDIR/$binary"
+ rm -f "$BINDIR/$binary"
done
- for manpage in ${MAN1}; do
- printf " RM\t%s\n" "${MANDIR}/man1/$d"
- rm -f "${MANDIR}/man1/$d"
+ for manpage in $MAN1; do
+ printf " RM\t%s\n" "$MANDIR/man1/$manpage"
+ rm -f "$MANDIR/man1/$manpage"
done
- for manpage in ${MAN2}; do
- printf " RM\t%s\n" "${MANDIR}/man2/$d"
- rm -f "${MANDIR}/man2/$d"
+ for manpage in $MAN2; do
+ printf " RM\t%s\n" "$MANDIR/man2/$manpage"
+ rm -f "$MANDIR/man2/$manpage"
done
- for manpage in ${MAN3}; do
- printf " RM\t%s\n" "${MANDIR}/man3/$d"
- rm -f "${MANDIR}/man3/$d"
+ for manpage in $MAN3; do
+ printf " RM\t%s\n" "$MANDIR/man3/$manpage"
+ rm -f "$MANDIR/man3/$manpage"
done
- for manpage in ${MAN4}; do
- printf " RM\t%s\n" "${MANDIR}/man4/$d"
- rm -f "${MANDIR}/man4/$d"
+ for manpage in $MAN4; do
+ printf " RM\t%s\n" "$MANDIR/man4/$manpage"
+ rm -f "$MANDIR/man4/$manpage"
done
- for manpage in ${MAN5}; do
- printf " RM\t%s\n" "${MANDIR}/man5/$d"
- rm -f "${MANDIR}/man5/$d"
+ for manpage in $MAN5; do
+ printf " RM\t%s\n" "$MANDIR/man5/$manpage"
+ rm -f "$MANDIR/man5/$manpage"
done
- for manpage in ${MAN6}; do
- printf " RM\t%s\n" "${MANDIR}/man6/$d"
- rm -f "${MANDIR}/man6/$d"
+ for manpage in $MAN6; do
+ printf " RM\t%s\n" "$MANDIR/man6/$manpage"
+ rm -f "$MANDIR/man6/$manpage"
done
- for manpage in ${MAN7}; do
- printf " RM\t%s\n" "${MANDIR}/man7/$d"
- rm -f "${MANDIR}/man7/$d"
+ for manpage in $MAN7; do
+ printf " RM\t%s\n" "$MANDIR/man7/$manpage"
+ rm -f "$MANDIR/man7/$manpage"
done
- for manpage in ${MAN8}; do
- printf " RM\t%s\n" "${MANDIR}/man8/$d"
- rm -f "${MANDIR}/man8/$d"
+ for manpage in $MAN8; do
+ printf " RM\t%s\n" "$MANDIR/man8/$manpage"
+ rm -f "$MANDIR/man8/$manpage"
done
diff --git a/lib/uninstall.mk b/lib/uninstall.mk
@@ -1,28 +1,28 @@
<$mkpklib/defaults.mk
uninstall-package:QV:
- record=$(grep "^${PKGBASE}\t" "${PKGDB}" 2>/dev/null || echo '')
- if [ -z "${record}" ]; then
- printf "Package %s is not installed\n" "${PKGBASE}" >&2
+ record=$(grep "^$PKGBASE\t" "$PKGDB" 2>/dev/null || echo '')
+ if [ -z "$record" ]; then
+ printf "Package %s is not installed\n" "$PKGBASE" >&2
exit 1
fi
- ver=$(echo "${record}" | cut -f2)
- if [ -z "${ver}" ]; then
+ ver=$(echo "$record" | cut -f2)
+ if [ -z "$ver" ]; then
printf "Corrupted record for %s in %s\n" \
- "${PKGBASE}" "${PKGDB}" >&2
+ "$PKGBASE" "$PKGDB" >&2
exit 1
else
- pkg=${PKGDIR}/${PKGBASE}-${ver}.tar.xz
+ pkg=$PKGDIR/$PKGBASE-$ver.tar.xz
cd /
- for item in $(xz -dc "${pkg}" | tar -tf -); do
- if [ -d "${item}" ]; then
- printf "( DIR\t%s skipped)\n" "${item}"
+ for item in $(xz -dc "$pkg" | tar -tf -); do
+ if [ -d "$item" ]; then
+ printf "( DIR\t%s skipped)\n" "$item"
continue
fi
- printf " RM\t%s\n" "${item}"
- rm "${item}"
+ printf " RM\t%s\n" "$item"
+ rm "$item"
done
- printf " UPD\t%s\n" "${PKGDB}"
- mv "${PKGDB}" "${PKGDB}"~
- sed "/^${PKGBASE}/d" < "${PKGDB}"~ >"${PKGDB}"
+ printf " UPD\t%s\n" "$PKGDB"
+ mv "$PKGDB" "$PKGDB"~
+ sed "/^$PKGBASE/d" < "$PKGDB"~ >"$PKGDB"
fi
diff --git a/lib/update.mk b/lib/update.mk
@@ -1,13 +1,13 @@
<$mkpklib/defaults.mk
update-mkfiles:QV:
- if [ ! -d "${SRCMKFILES}" ]; then
- cd "${SRCBASEDIR}"
- printf " GIT\t%s %s\n" clone "${SRCMKFILES}"
- git clone "${MKFILESREPO}"
+ if [ ! -d "$SRCMKFILES" ]; then
+ cd "$SRCBASEDIR"
+ printf " GIT\t%s %s\n" clone "$SRCMKFILES"
+ git clone "$MKFILESREPO"
else
- cd "${SRCMKFILES}"
- printf " GIT\t%s %s\n" pull "${SRCMKFILES}"
+ cd "$SRCMKFILES"
+ printf " GIT\t%s %s\n" pull "$SRCMKFILES"
if ! git pull >/dev/null 2>&1; then
git reset --hard >/dev/null 2>&1
git pull >/dev/null 2>&1
