scottk/scratchpkg
1
0
Fork 0
mirror of https://github.com/outbackdingo/scratchpkg.git synced 2026-03-20 00:13:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

updated

Browse Source
This commit is contained in:
emmett1
2018-06-20 21:47:05 +08:00
parent dd4d7df093
commit b8b8c7c3dc
3 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
buildpkg
View File

@@ -614,10 +614,6 @@ main() {
checkdirwrite "$WORK_DIR" "$SOURCE_DIR" "$PACKAGE_DIR" "$LOG_DIR"
checkdirread "$WORK_DIR" "$SOURCE_DIR" "$PACKAGE_DIR" "$LOG_DIR"
if [ "$INSTALL_PKG" ] || [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then
NO_ORPHAN_CHECK=yes
fi
# check the required field in spkgbuild
if [ -z "$name" ]; then
msgerr "'name' is empty!"
@@ -634,6 +630,15 @@ main() {
elif [ "`type -t build`" != "function" ]; then
msgerr "'build' function not exist!"
exit 1
elif $(echo "$version" | grep -q '-'); then
msgerr "'version' should not contain '-'."
exit 1
elif $(echo "$release" | grep -q '-'); then
msgerr "'release' should not contain '-'."
exit 1
elif [ -z "$description" ]; then
msgerr "'description' cant empty."
exit 1
fi
PKGNAME="$name-$version-$release.spkg.txz"

6
functions/message
View File

@@ -33,11 +33,11 @@ msginst() {
}
msgnew() {
echo -e "[${GREEN}N${CRESET}] $@"
echo -e "[${GREEN}n${CRESET}] $@"
}
msgupg() {
echo -e "[${GREEN}U${CRESET}] $@"
echo -e "[${GREEN}u${CRESET}] $@"
}
msgnoinst() {
@@ -45,5 +45,5 @@ msgnoinst() {
}
msgmiss() {
echo -e "[${RED}M${CRESET}] $@"
echo -e "[${RED}m${CRESET}] $@"
}

8
scratch
View File

@@ -398,11 +398,11 @@ sysup() {
NEWPKG=0
for d in ${DEP[@]}; do
if [ "$(echo ${PKGOUTDATE[@]} | tr ' ' '\n' | grep -x $d)" = "$d" ]; then
echo -ne "[${GREEN}U${CRESET}] $d "
echo -ne "[${GREEN}u${CRESET}] $d "
WILLINSTALL+=($d)
UPGPKG=$(( $UPGPKG + 1 ))
elif [ ! -e "$INDEX_DIR/$d/.pkginfo" ] && getportpath "$d" >/dev/null; then
echo -ne "[${CYAN}N${CRESET}] $d "
echo -ne "[${CYAN}n${CRESET}] $d "
WILLINSTALL+=($d)
NEWPKG=$(( $NEWPKG + 1 ))
fi
@@ -874,11 +874,11 @@ if [ "$mode" = "install" ]; then
done
echo
for pkg in ${WILLINSTALL[@]}; do
echo -ne "[${GREEN}I${CRESET}] $pkg "
echo -ne "[${GREEN}i${CRESET}] $pkg "
done
if [ ${#MISSINGPKG[@]} -gt 0 ]; then
for pkg in ${MISSINGPKG[@]}; do
echo -ne "[${RED}M${CRESET}] $pkg "
echo -ne "[${RED}m${CRESET}] $pkg "
done
fi
echo