This commit is contained in:
emmett1
2018-06-09 17:22:13 +08:00
parent afad8532b2
commit d8d0eb0e65
5 changed files with 20 additions and 15 deletions

View File

@@ -393,20 +393,20 @@ checkdeps() {
fi
done
for makedep in ${makedepends[@]}; do
if [ ! -d $INDEX_DIR/$makedep ]; then
MSMKDEP+=($makedep)
fi
done
#for makedep in ${makedepends[@]}; do
#if [ ! -d $INDEX_DIR/$makedep ]; then
#MSMKDEP+=($makedep)
#fi
#done
if [ "${#MSDEP[@]}" -gt 0 ] || [ "${#MSMKDEP[@]}" -gt 0 ]; then
if [ "${#MSDEP[@]}" -gt 0 ]; then
msg "Missing dependencies:"
for msd in ${MSDEP[@]}; do
msg2 "$msd"
done
for msmkd in ${MSMKDEP[@]}; do
msg2 "$msmkd ${CYAN}(make)${CRESET}"
done
#for msmkd in ${MSMKDEP[@]}; do
#msg2 "$msmkd ${CYAN}(make)${CRESET}"
#done
exitscript1
fi

View File

@@ -100,7 +100,12 @@ compressinfomanpages() {
if [ -d $mandir ]; then
(cd $mandir
find . -type f ! -name "*.gz" -exec gzip -9 -f {} \; 2>/dev/null
for i in $(find . -type l) ; do ln -s $(readlink $i).gz $i.gz ; rm $i ; done
for i in $(find . -type l) ; do
if [ $(readlink $i) = ${i%%.gz} ]; then
ln -s $(readlink $i).gz $i.gz
rm $i
fi
done
)
fi
done

View File

@@ -70,7 +70,7 @@ installpkg() {
}
rm -f /tmp/spkginstall.$name
installcmd $PKGNAME | while IFS=' ' read line; do
LC_ALL= installcmd $PKGNAME | while IFS=' ' read line; do
if [ "$line" = "${line%.*}.spkgnew" ]; then
line=${line%.*}
if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then

View File

@@ -99,9 +99,9 @@ checkdep() {
echo $dep
done
for mdep in ${makedepends[@]}; do
echo $mdep
done
#for mdep in ${makedepends[@]}; do
# echo $mdep
#done
}
@@ -807,7 +807,7 @@ if [ "$mode" = "build" ]; then
parseopt() {
while [ "$1" ]; do
case $1 in
-f|-m|-d|-e|-w|-o|--srcdir=*|--pkgdir=*) OPTS+=($1) ;;
-f|-m|-d|-e|-w|-o|-v|--verbose|--srcdir=*|--pkgdir=*) OPTS+=($1) ;;
--skip-mdsum|--no-dep|--extract|--keep-work|--download) OPTS+=($1) ;;
--force-rebuild|--redownload|--no-preinstall) OPTS+=($1) ;;
-*) msgerr "Invalid option! ($1)"; exit 1 ;;