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

add --workdir option to pkgadd and scratch

Browse Source
This commit is contained in:
emmett1
2019-07-26 23:06:13 +08:00
parent d47c41c8b3
commit 843bf32971
2 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
pkgbuild
View File

@@ -336,10 +336,6 @@ packaging() {
[ -f $f ] && install -m644 $f $PKG/.pkg$f
done
#[ -f install ] && install -m644 install $PKG/.pkginstall
#[ -f readme ] && install -m644 readme $PKG/.pkgreadme
#[ -f mkdirs ] && install -m644 mkdirs $PKG/.pkgmkdirs
pushd $PKG >/dev/null
rm -f usr/{,share/}info/dir
@@ -484,7 +480,7 @@ parse_opts() {
-u | --upgrade) UPGRADE_PKG=yes; OPTS+=($1) ;;
-r | --reinstall) REINSTALL_PKG=yes; OPTS+=($1) ;;
-c | --ignore-conflict) OPTS+=($1) ;;
-v | --verbose) VERBOSE=yes; OPTS+=($1) ;;
-v | --verbose) OPTS+=($1) ;;
-f | --force-rebuild) FORCE_REBUILD=yes ;;
-m | --skip-mdsum) IGNORE_MDSUM=yes ;;
-g | --genmdsum) UPDATE_MDSUM=yes ;;
@@ -493,7 +489,7 @@ parse_opts() {
-w | --keep-work) KEEP_WORK=yes ;;
-l | --log) LOGGING=yes ;;
-h | --help) SHOWHELP=yes ;;
--no-preinstall) NO_PREINSTALL=yes; OPTS+=($1) ;;
--no-preinstall) OPTS+=($1) ;;
--no-postinstall) OPTS+=($1) ;;
--no-preupgrade) OPTS+=($1) ;;
--no-postupgrade) OPTS+=($1) ;;
@@ -503,6 +499,7 @@ parse_opts() {
--srcdir=*) CUSTOM_SOURCE_DIR="${1#*=}" ;;
--pkgdir=*) CUSTOM_PACKAGE_DIR="${1#*=}" ;;
--logdir=*) CUSTOM_LOG_DIR="${1#*=}" ;;
--workdir=*) CUSTOM_WORK_DIR="${1#*=}" ;;
*) msg "Invalid $(basename $0) option! ($1)"; exit 1 ;;
esac
shift
@@ -532,6 +529,7 @@ Options:
--srcdir=<path> override directory path for sources
--pkgdir=<path> override directory path for compiled package
--logdir=<path> override directory path for build logs
--workdir=<path> override directory path for working dir
--no-preinstall skip preinstall script before install package
--no-postinstall skip postinstall script after install package
--no-preupgrade skip preupgrade script before upgrade package
@@ -565,13 +563,10 @@ main() {
LOG_DIR="$CUSTOM_LOG_DIR"
fi
if [ -z "$SOURCE_DIR" ]; then
msgerr "Option '--srcdir=' need argument (path)"
exit 1
elif [ -z "$PACKAGE_DIR" ]; then
msgerr "Option '--pkgdir=' need argument (path)"
exit 1
if [ "$CUSTOM_WORK_DIR" ]; then
WORK_DIR="$CUSTOM_WORK_DIR"
fi
checkdir "$SOURCE_DIR" "$PACKAGE_DIR" "$WORK_DIR" "$LOG_DIR"
# show usage
@@ -658,8 +653,7 @@ main() {
pkgadd $PACKAGE_DIR/$PKGNAME $INST_OPT ${OPTS[@]} || abort 1
fi
abort 0
abort 0
}
trap "interrupted" SIGHUP SIGINT SIGQUIT SIGTERM

12
scratch
View File

@@ -734,7 +734,7 @@ scratch_build() {
OPTS+=($1)
elif [[ "$1" =~ ^--(force-rebuild|skip-mdsum|download|extract|keep-work|redownload|log)$ ]]; then
OPTS+=($1)
elif [[ "$1" =~ ^--(pkgdir|srcdir|logdir)=* ]]; then
elif [[ "$1" =~ ^--(pkgdir|srcdir|logdir|workdir)=* ]]; then
OPTS+=($1)
elif [[ "$1" =~ ^-. ]]; then
echo "Unrecognize option. ($1)"
@@ -768,7 +768,7 @@ scratch_install() {
while [ "$1" ]; do
if [[ "$1" =~ ^-(c|v|l|-verbose|-ignore-conflict|-no-backup|-log)$ ]]; then
OPTS+=($1)
elif [[ "$1" =~ ^--(srcdir|pkgdir|logdir)=* ]]; then
elif [[ "$1" =~ ^--(srcdir|pkgdir|logdir|workdir)=* ]]; then
OPTS+=($1)
elif [[ "$1" =~ ^--(no-preinstall|no-postinstall)$ ]]; then
OPTS+=($1)
@@ -984,7 +984,7 @@ scratch_sysup() {
while [ "$1" ]; do
if [[ "$1" =~ ^--(no-postupgrade|no-preupgrade|no-backup|log)$ ]]; then
OPTS+=($1)
elif [[ "$1" =~ ^--(srcdir|pkgdir|logdir)=* ]]; then
elif [[ "$1" =~ ^--(srcdir|pkgdir|logdir|workdir)=* ]]; then
OPTS+=($1)
elif [[ "$1" =~ ^-(c|v|l|-verbose|-ignore-conflict)$ ]]; then
OPTS+=($1)
@@ -1089,7 +1089,7 @@ scratch_upgrade() {
while [ "$1" ]; do
if [[ "$1" =~ ^--(no-postupgrade|no-preupgrade|no-backup|log)$ ]]; then
OPTS+=($1)
elif [[ "$1" =~ ^--(srcdir|pkgdir|logdir)=* ]]; then
elif [[ "$1" =~ ^--(srcdir|pkgdir|logdir|workdir)=* ]]; then
OPTS+=($1)
elif [[ "$1" =~ ^-(c|v|l|-ignore-conflict|-verbose) ]]; then
OPTS+=($1)
@@ -1394,6 +1394,7 @@ Options:
--srcdir=<path> override default SOURCE_DIR
--pkgdir=<path> override default PACKAGE_DIR
--logdir=<path> override default LOG_DIR
--workdir=<path> override default WORK_DIR
EOF
}
@@ -1415,6 +1416,7 @@ Options:
--srcdir=<path> override default SOURCE_DIR
--pkgdir=<path> override default PACKAGE_DIR
--logdir=<path> override default LOG_DIR
--workdir=<path> override default WORK_DIR
EOF
}
@@ -1437,6 +1439,7 @@ Options:
--srcdir=<path> override default SOURCE_DIR
--pkgdir=<path> override default PACKAGE_DIR
--logdir=<path> override default LOG_DIR
--workdir=<path> override default WORK_DIR
EOF
}
@@ -1473,6 +1476,7 @@ Options:
--srcdir=<path> override default SOURCE_DIR
--pkgdir=<path> override default PACKAGE_DIR
--logdir=<path> override default LOG_DIR
--workdir=<path> override default WORK_DIR
EOF
}