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

updated

Browse Source
This commit is contained in:
emmett1
2018-06-04 22:25:03 +08:00
parent 9c077a6fd0
commit 14fb01e2a4
4 changed files with 83 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
buildpkg
View File

@@ -4,6 +4,17 @@ export LC_ALL=C
. /usr/share/scratchpkg/functions || exit 1
backupconf() {
for bkp in ${backup[@]}; do
if [ ! -f $bkp ]; then
msgerr "File '$bkp' not exist!"
exit 1
else
mv $bkp $bkp.spkgnew
fi
done
}
source_check() {
url_stat=0
@@ -283,6 +294,10 @@ packaging() {
compressinfomanpages
fi
if [ "${#backup[@]}" -gt 0 ]; then
backupconf
fi
echo "# Generated by buildpkg" > .pkginfo
echo "# `date`" >> .pkginfo
echo "name = $name" >> .pkginfo

19
extra/revdep
View File

@@ -7,8 +7,6 @@ source "/usr/share/scratchpkg/message"
onepkg() {
MISSING=""
pushd / >/dev/null
echo -ne "Checking $1...\r"
while IFS=' ' read -r line; do
@@ -16,17 +14,9 @@ onepkg() {
*application/x-sharedlib* | *application/x-executable*)
if [ "$(ldd $line 2>/dev/null | grep "not found")" ]; then
LIB_NAME=$(ldd $line 2>/dev/null | grep "not found" | sort | uniq | awk '{print $1}')
LIB=$(echo $LIB_NAME | tr '\n' ' ')
REQ_LIB=$(objdump -p $line 2>/dev/null | grep NEEDED | awk '{print $2}' | tr '\n' ' ')
for i in $LIB_NAME; do
echo -e "$line ${GREEN}>>>${CRESET} $i"
if echo $REQ_LIB | grep -q $i; then
MISSING_LIB="$MISSING_LIB $i"
fi
echo -e "(${GREEN}$1${CRESET}) $line ${GREEN}>>>${CRESET} $i"
done
if [ "$MISSING_LIB" != "" ]; then
echo "$MISSING_LIB"
fi
MISSING=yes
fi ;;
*)
@@ -38,7 +28,7 @@ onepkg() {
echo -ne "\033[0K"
[ "$MISSING" != "yes" ] && msg "Packages '$1' is doing fine."
return 0
MISSING=
}
allpkg() {
@@ -59,13 +49,12 @@ allpkg() {
LIB=$(echo $LIB_NAME | tr '\n' ' ')
for i in $LIB_NAME; do
echo -e "(${GREEN}$PKG_NAME${CRESET}) $line ${GREEN}>>>${CRESET} $i"
if echo $REQ_LIB | grep -q $i; then
if [[ "$(echo ${ALLPKG[@]} | tr ' ' '\n' | grep -w "$PKG_NAME")" ]]; then
if echo $REQ_LIB | tr ' ' '\n' | grep -qx $i; then
if [[ "$(echo ${ALLPKG[@]} | tr ' ' '\n' | grep -x "$PKG_NAME")" ]]; then
continue
else
ALLPKG+=($PKG_NAME)
fi
MISSING_LIB="$MISSING_LIB $i"
fi
done
fi ;;

192
installpkg
View File

@@ -46,17 +46,11 @@ installpkg() {
# create lock file prevent simultaneous install package
spkglock
# backup conf as set in spkgbuld if upgrade or reinstall package
if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then
if [ ! "$NO_BACKUP" ] && [ -n "$backup" ]; then
msg2 "Backup configuration file..."
backupconf
fi
fi
# source .install file inside package
if [ $(tar -tf "$PKGNAME" | grep -x ".pkginstall") ] && [ ! "$REINSTALL_PKG" ]; then
source <(tar -xf "$PKGNAME" .pkginstall -O)
if [ ! "$REINSTALL_PKG" ]; then
if [ $(tar -tf "$PKGNAME" | grep -x ".pkginstall") ]; then
source <(tar -xf "$PKGNAME" .pkginstall -O)
fi
fi
# run preinstall script if no --no-preinstall flag and not upgrade package
@@ -71,22 +65,35 @@ installpkg() {
#installing package into system
msg2 "Extracting package..."
if [ "$VERBOSE_INSTALL" ]; then
tar --keep-directory-symlink --no-overwrite-dir -p -x -v -f $PKGNAME -C $ROOT_DIR --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]} | while read line; do echo -e " + $line"; done
else
tar --keep-directory-symlink --no-overwrite-dir -p -x -f $PKGNAME -C $ROOT_DIR --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]}
fi
installcmd() {
tar --keep-directory-symlink --no-overwrite-dir -p -x -v -f $1 -C $ROOT_DIR --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]}
}
if [ $? != 0 ]; then
msgerr "Failed install ${RED}$name-$version-$release${CRESET}."
while IFS=' ' read -r line; do
pushd $ROOT_DIR
rm_silent "$line" || rmdir_silent --ignore-fail-on-non-empty "$line"
popd
done < <(tar -tf "$PKGNAME" --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]} | tac)
spkglock
exit 1
fi
rm -f /tmp/spkginstall.$name
installcmd $PKGNAME | while IFS=' ' read line; do
if [ "$line" = "${line%.*}.spkgnew" ]; then
line=${line%.*}
if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then
if [ ! -e ${ROOT_DIR}${line} ]; then
mv ${ROOT_DIR}${line}.spkgnew ${ROOT_DIR}${line}
fi
else
mv ${ROOT_DIR}${line}.spkgnew ${ROOT_DIR}${line}
fi
fi
echo "$line" >> /tmp/spkginstall.$name
done
#if [ $? != 0 ]; then
#msgerr "Failed install ${RED}$name-$version-$release${CRESET}."
#while IFS=' ' read -r line; do
#pushd $ROOT_DIR
#rm_silent "$line" || rmdir_silent --ignore-fail-on-non-empty "$line"
#popd
#done < <(tar -tf "$PKGNAME" --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]} | tac)
#spkglock
#exit 1
#fi
if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then
msg2 "Removing old files..."
@@ -103,8 +110,6 @@ installpkg() {
run_postupgrade
fi
restoreconf
case $PREINSTALL_STATUS in
OK) msg2 "preinstall : ${GREEN}OK${CRESET}" ;;
KO) msg2 "preinstall : ${RED}FAIL${CRESET}" ;;
@@ -139,10 +144,9 @@ installpkg() {
removeoldfiles() {
TMP_TARLIST="/tmp/$name.tarlist.spkg"
tar -tf "$PKGNAME" --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]} > $TMP_TARLIST
TMP_TARLIST="/tmp/spkginstall.$name"
grep -v '/$' $INDEX_DIR/$name/.files | while read line; do
grep -v '/$' $INDEX_DIR/$name/.files | while IFS=' ' read line; do
if [ ! "$(grep -Fx "$line" $TMP_TARLIST)" ]; then
pushd $ROOT_DIR
if [ "$VERBOSE_INSTALL" = "yes" ]; then
@@ -165,57 +169,28 @@ removeoldfiles() {
popd
fi
done < <(tac $INDEX_DIR/$name/.files | grep '/$')
rm $TMP_TARLIST
}
registerpkg() {
[ ! -d $INDEX_DIR/$name ] && mkdir $INDEX_DIR/$name
rm -fr $INDEX_DIR/$name
mkdir $INDEX_DIR/$name
tar -x -f $PKGNAME -C $INDEX_DIR/$name .pkginfo
tar -t -f $PKGNAME --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]} > $INDEX_DIR/$name/.files
cat /tmp/spkginstall.$name > $INDEX_DIR/$name/.files
rm -f /tmp/spkginstall.$name
#tar -t -f $PKGNAME --exclude=.pkginfo --exclude=.pkginstall --exclude=.pkgreadme ${excludefile[@]} > $INDEX_DIR/$name/.files
tar -x -f $PKGNAME -C $INDEX_DIR/$name .pkginstall .pkgreadme >/dev/null 2>&1
}
checkdeps() {
for dep in ${depends[@]}; do
if [ ! -d $INDEX_DIR/$dep ]; then
MSGDEP+=($dep)
fi
done
if [ "${#MSGDEP[@]}" -gt 0 ]; then
msg "Missing dependencies:"
for msdp in ${MSGDEP[@]}; do
msg2 "$msdp"
done
exit 1
fi
}
checkpkgconflict() {
for pkg in ${conflict[@]}; do
if [ -d $INDEX_DIR/$pkg ]; then
msg "Conflict package!: ${YELLOW}$pkg${CRESET}"
PKG_CONFLICT=yes
fi
done
if [ "$PKG_CONFLICT" ]; then
exit 1
fi
}
checkconflict() {
while IFS=' ' read -r line; do
pushd $ROOT_DIR
if [ "$line" = "${line%.*}.spkgnew" ]; then
line=${line%.*}
fi
if [ -e "$line" ]; then
fileconflict+=(${line})
fi
@@ -236,6 +211,9 @@ upcheckconflict() {
while IFS=' ' read -r line; do
pushd $ROOT_DIR
if [ "$line" = "${line%.*}.spkgnew" ]; then
line=${line%.*}
fi
if [ -e "$line" ]; then
if [ ! "$(grep -Fx "$line" "$INDEX_DIR/$name/.files")" ]; then
fileconflict+=(${line})
@@ -254,34 +232,6 @@ upcheckconflict() {
}
backupconf() {
pushd $ROOT_DIR
for bkp in ${backup[@]}; do
if [ -e $bkp ]; then
rm -f $bkp.spkgtmp
cp $bkp $bkp.spkgtmp
FILEBACKUP+=($bkp)
fi
done
popd
}
restoreconf() {
if [ "${#FILEBACKUP[@]}" -gt 0 ]; then
pushd $ROOT_DIR
for b in ${FILEBACKUP[@]}; do
if [ -e $b ]; then
mv $b $b.spkgnew
mv $b.spkgtmp $b
fi
done
popd
fi
}
checkoutdate() {
if [ "$version-$release" = "$iversion-$irelease" ]; then
@@ -426,7 +376,6 @@ parse_opts() {
main() {
#parse_options "$@"
parse_opts $(extract_opt $@)
BASEPKGNAME=$(basename $PKGNAME)
@@ -448,7 +397,7 @@ main() {
exit 1
fi
echo -ne "Reading $BASEPKGNAME...\r"
echo -ne "Loading $BASEPKGNAME...\r"
# check integrity of package
if ! tar -tf $PKGNAME &>/dev/null; then
@@ -471,55 +420,32 @@ main() {
exit 1
fi
# extract .pkginfo file into /tmp ###
tar -xf $PKGNAME .pkginfo -O > /tmp/spkg.$BASEPKGNAME.pkginfo
### GET NAME, VERSION, RELEASE FROM TMP .pkginfo FILE ###
name=$(getinfopkg name $BASEPKGNAME)
version=$(getinfopkg version $BASEPKGNAME)
release=$(getinfopkg release $BASEPKGNAME)
depends=$(getinfopkg depends $BASEPKGNAME)
makedepends=$(getinfopkg makedepends $BASEPKGNAME)
backup=$(getinfopkg backup $BASEPKGNAME)
conflict=$(getinfopkg conflict $BASEPKGNAME)
# tmp
depends+=(${makedepends[@]})
### REMOVE .pkginfo file from /tmp ###
rm -f /tmp/spkg.$BASEPKGNAME.pkginfo
echo -ne "\033[0K"
### IF INSTALLED & NO UPGRADE & NO REINSTALL ###
if [ -d $INDEX_DIR/$name ] && [ ! "$UPGRADE_PKG" ] && [ ! "$REINSTALL_PKG" ]; then
name=$(echo $BASEPKGNAME | sed 's/.spkg.txz//' | rev | cut -d - -f 3- | rev)
version=$(echo $BASEPKGNAME | sed 's/.spkg.txz//' | rev | cut -d - -f 2 | rev)
release=$(echo $BASEPKGNAME | sed 's/.spkg.txz//' | rev | cut -d - -f 1 | rev)
# get package information if installed
if [ -e $INDEX_DIR/$name/.pkginfo ]; then
iname=$(installed_pkg_info name $name)
iversion=$(installed_pkg_info version $name)
irelease=$(installed_pkg_info release $name)
msg "Package ${GREEN}$iname-$iversion-$irelease${CRESET} already installed."
ALREADYINSTALLED=yes
fi
if [ "$ALREADYINSTALLED" = "yes" ] && [ ! "$UPGRADE_PKG" ] && [ ! "$REINSTALL_PKG" ]; then
msg "Package '$name' already installed. (${GREEN}$iversion-$irelease${CRESET})"
exit 0
fi
### IF UPGRADE OR REINSTALL PACKAGE ###
if [ "$UPGRADE_PKG" ] || [ "$REINSTALL_PKG" ]; then
if [ ! -d $INDEX_DIR/$name ]; then
msg "Package ${RED}$name${CRESET} is not installed."
if [ "$ALREADYINSTALLED" != "yes" ]; then
msgerr "Package ${RED}$name${CRESET} not installed."
exit 1
fi
iname=$(installed_pkg_info name $name)
iversion=$(installed_pkg_info version $name)
irelease=$(installed_pkg_info release $name)
# UPGRADE PACKAGE
if [ "$UPGRADE_PKG" ]; then
if [ -f "$INDEX_DIR/$name"/.lock ]; then
msgerr "Package '$name' is locked."
exit 0
fi
checkoutdate
#msg "Upgrading package: ${YELLOW}$iname-$iversion-$irelease${CRESET} -> ${GREEN}$name-$version-$release${CRESET}"
# REINSTALL PACKAGE
#elif [ "$REINSTALL_PKG" ]; then
#msg "Reinstall package ${GREEN}$name${CRESET}."
fi
fi

5
scratch
View File

@@ -603,6 +603,11 @@ updports() {
checktool httpup
needroot "Updating ports"
if [ ! -e /etc/scratchpkg.repo ]; then
msgerr "Repo file not found! (/etc/scratchpkg.repo)"
exit 1
fi
while read repodir repourl junk; do
case $repodir in