kiss: Fix install bug.
This commit is contained in:
Dylan Araps
parent
43102ccfbb
commit
bbfa4e447c
39
kiss
39
kiss
|
|
@ -92,8 +92,8 @@ pkg_list() {
|
|||
# avoid having to 'basename' each path. If this fails,
|
||||
# set '$1' to mimic a failed glob which indicates that
|
||||
# nothing is installed.
|
||||
cd "$KISS_ROOT/$db" 2>/dev/null ||
|
||||
set -- "$KISS_ROOT/$db/"\*
|
||||
cd "$KISS_ROOT/$pkg_db" 2>/dev/null ||
|
||||
set -- "$KISS_ROOT/$pkg_db/"\*
|
||||
|
||||
# Optional arguments can be passed to check for specific
|
||||
# packages. If no arguments are passed, list all. As we
|
||||
|
|
@ -103,7 +103,7 @@ pkg_list() {
|
|||
|
||||
# If the 'glob' above failed, exit early as there are no
|
||||
# packages installed.
|
||||
[ "$1" = "$KISS_ROOT/$db/"\* ] && return 1
|
||||
[ "$1" = "$KISS_ROOT/$pkg_db/"\* ] && return 1
|
||||
|
||||
# Loop over each version file and warn if one doesn't exist.
|
||||
# Also warn if a package is missing its version file.
|
||||
|
|
@ -319,7 +319,7 @@ pkg_manifest() (
|
|||
# with a trailing forward slash '/'. The list is then reversed with
|
||||
# directories appearing *after* their contents.
|
||||
find . -mindepth 1 -type d -exec printf '%s/\n' {} + -or -print |
|
||||
sort -r | sed -e ss.ss > "$pkg_dir/$1/$db/$1/manifest"
|
||||
sort -r | sed -e ss.ss > "$pkg_dir/$1/$pkg_db/$1/manifest"
|
||||
|
||||
log "[$1]: Generated manifest."
|
||||
)
|
||||
|
|
@ -486,7 +486,7 @@ pkg_build() {
|
|||
|
||||
# Install built packages to a directory under the package name
|
||||
# to avoid collisions with other packages.
|
||||
mkdir -p "$pkg_dir/$pkg/$db"
|
||||
mkdir -p "$pkg_dir/$pkg/$pkg_db"
|
||||
|
||||
# Move to the build directory and call the build script.
|
||||
(cd "$mak_dir/$pkg"; fakeroot "$repo_dir/build" "$pkg_dir/$pkg") ||
|
||||
|
|
@ -494,13 +494,13 @@ pkg_build() {
|
|||
|
||||
# Copy the repository files to the package directory.
|
||||
# This acts as the database entry.
|
||||
cp -Rf "$repo_dir" "$pkg_dir/$pkg/$db/"
|
||||
cp -Rf "$repo_dir" "$pkg_dir/$pkg/$pkg_db/"
|
||||
|
||||
log "[$pkg]: Successfully built package."
|
||||
|
||||
# Create the manifest file early and make it empty.
|
||||
# This ensure that the manifest is added to the manifest...
|
||||
: > "$pkg_dir/$pkg/$db/$pkg/manifest"
|
||||
: > "$pkg_dir/$pkg/$pkg_db/$pkg/manifest"
|
||||
|
||||
pkg_strip "$pkg"
|
||||
pkg_manifest "$pkg"
|
||||
|
|
@ -571,14 +571,14 @@ pkg_conflicts() {
|
|||
log "[$2]: Checking for package conflicts."
|
||||
|
||||
# Extract manifest from the tar-ball and only extract files entries.
|
||||
tar xf "$1" -O "./$db/$2/manifest" |
|
||||
tar xf "$1" -O "./$pkg_db/$2/manifest" |
|
||||
while read -r line; do
|
||||
[ "${line%%*/}" ] && printf '%s\n' "$line" >> "$cac_dir/manifest-$pid"
|
||||
done ||:
|
||||
|
||||
# Compare extracted manifest to all installed manifests.
|
||||
# If there are matching lines (files) there is a package conflict.
|
||||
for db in "$KISS_ROOT/$db/"*; do
|
||||
for db in "$KISS_ROOT/$pkg_db/"*; do
|
||||
[ "$2" = "${db##*/}" ] && continue
|
||||
|
||||
grep -Fxf "$cac_dir/manifest-$pid" "$db/manifest" 2>/dev/null &&
|
||||
|
|
@ -607,7 +607,7 @@ pkg_remove() {
|
|||
}
|
||||
|
||||
# Make sure that nothing depends on this package.
|
||||
[ "$2" = check ] && for file in "$KISS_ROOT/$db/"*; do
|
||||
[ "$2" = check ] && for file in "$KISS_ROOT/$pkg_db/"*; do
|
||||
# Check each depends file for the package and if it's
|
||||
# a run-time dependency, append to the $required_by string.
|
||||
grep -q "^$1$" "$file/depends" 2>/dev/null &&
|
||||
|
|
@ -634,7 +634,7 @@ pkg_remove() {
|
|||
"$cac_dir/rm" -f -- "$KISS_ROOT/$file" ||
|
||||
log "[$1]: Failed to remove '$file'."
|
||||
fi
|
||||
done < "$KISS_ROOT/$db/$1/manifest"
|
||||
done < "$KISS_ROOT/$pkg_db/$1/manifest"
|
||||
|
||||
# Reset 'trap' to its original value. Installation is done so
|
||||
# we no longer need to block 'Ctrl+C'.
|
||||
|
|
@ -674,7 +674,8 @@ pkg_install() {
|
|||
# Figure out which package the tar-ball installs by checking for
|
||||
# a database entry inside the tar-ball. If no database entry exists,
|
||||
# exit here as the tar-ball is *most likely* not a KISS package.
|
||||
pkg_name=$(tar tf "$tar_file" | grep -x "\./$db/.*/version") ||
|
||||
tar tf "$tar_file" 2>&1 | less
|
||||
pkg_name=$(tar tf "$tar_file" | grep -x "\./$pkg_db/.*/version") ||
|
||||
die "'${tar_file##*/}' is not a valid KISS package."
|
||||
|
||||
pkg_name=${pkg_name%/*}
|
||||
|
|
@ -692,12 +693,12 @@ pkg_install() {
|
|||
|
||||
# Make sure that all run-time dependencies are installed prior to
|
||||
# installing the package.
|
||||
[ -f "$tar_dir/$db/$pkg_name/depends" ] &&
|
||||
[ -f "$tar_dir/$pkg_db/$pkg_name/depends" ] &&
|
||||
while read -r dep dep_type; do
|
||||
[ "${dep##\#*}" ] || continue
|
||||
[ "$dep_type" ] || pkg_list "$dep" >/dev/null ||
|
||||
required_install="$required_install'$dep', "
|
||||
done < "$tar_dir/$db/$pkg_name/depends"
|
||||
done < "$tar_dir/$pkg_db/$pkg_name/depends"
|
||||
|
||||
[ "$required_install" ] &&
|
||||
die "[$1]: Package requires ${required_install%, }." \
|
||||
|
|
@ -730,7 +731,7 @@ pkg_install() {
|
|||
|
||||
# Run the post install script and suppress errors. If it exists,
|
||||
# it will run, else nothing will happen.
|
||||
"$KISS_ROOT/$db/$pkg_name/post-install" 2>/dev/null ||:
|
||||
"$KISS_ROOT/$pkg_db/$pkg_name/post-install" 2>/dev/null ||:
|
||||
|
||||
log "[$pkg_name]: Installed successfully."
|
||||
done
|
||||
|
|
@ -763,7 +764,7 @@ pkg_updates() {
|
|||
|
||||
log "Checking for new package versions..."
|
||||
|
||||
for pkg in "$KISS_ROOT/$db/"*; do
|
||||
for pkg in "$KISS_ROOT/$pkg_db/"*; do
|
||||
# Find the package's repository files. This needs to keep
|
||||
# happening as we can't store this data in any kind of data
|
||||
# structure.
|
||||
|
|
@ -876,7 +877,7 @@ args() {
|
|||
|
||||
# If no arguments were passed, rebuild all packages.
|
||||
[ "$1" ] || {
|
||||
cd "$KISS_ROOT/$db" || die "Failed to find package db."
|
||||
cd "$KISS_ROOT/$pkg_db" || die "Failed to find package db."
|
||||
|
||||
# Use a glob after 'cd' to generate a list of all installed
|
||||
# packages based on directory names.
|
||||
|
|
@ -952,7 +953,7 @@ args() {
|
|||
|
||||
# Print version and exit.
|
||||
v*)
|
||||
log "$kiss 0.4.0"
|
||||
log "$kiss 0.4.1"
|
||||
;;
|
||||
|
||||
# Catch all invalid arguments as well as
|
||||
|
|
@ -978,7 +979,7 @@ main() {
|
|||
kiss=${0##*/}
|
||||
|
||||
# Set the location to the repository and package database.
|
||||
db=var/db/kiss/installed
|
||||
pkg_db=var/db/kiss/installed
|
||||
|
||||
# The PID of the current shell process is used to isolate directories
|
||||
# to each specific KISS instance. This allows multiple package manager
|
||||
|
|
|
|||
Loading…
Reference in New Issue