kiss-community/kiss
1
0
Fork 1
mirror of https://codeberg.org/kiss-community/kiss synced 2025-01-13 06:10:07 -07:00
Code Issues Wiki

Merge pull request #46 from kisslinux/nofakeroot

Browse Source 
kiss: remove fakeroot usage
This commit is contained in:
black 2019-08-30 11:06:00 +00:00 committed by GitHub
commit 507e0d0b31
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
kiss
View File

@ -382,11 +382,9 @@ pkg_tar() {
# Read the version information to name the package. # Read the version information to name the package.
read -r version release < "$repo_dir/version" read -r version release < "$repo_dir/version"
# Create a tar-ball from the contents of the built package. `fakeroot` # Create a tar-ball from the contents of the built package.
# is used here to correct issues with file ownership. tar zpcf "$bin_dir/$1#$version-$release.tar.gz" -C "$pkg_dir/$1" . ||
fakeroot \ die "[$1] Failed to create tar-ball"
tar zpcf "$bin_dir/$1#$version-$release.tar.gz" -C "$pkg_dir/$1" . ||
die "[$1] Failed to create tar-ball"
log "[$1] Successfully created tar-ball" log "[$1] Successfully created tar-ball"
} }
@ -514,7 +512,7 @@ pkg_build() {
# Move to the build directory and call the build script. # Move to the build directory and call the build script.
cd "$mak_dir/$pkg" cd "$mak_dir/$pkg"
fakeroot "$repo_dir/build" "$pkg_dir/$pkg" || "$repo_dir/build" "$pkg_dir/$pkg" ||
die "[$pkg] Build failed" die "[$pkg] Build failed"
# Copy the repository files to the package directory. # Copy the repository files to the package directory.
@ -775,7 +773,8 @@ pkg_install() {
# This is repeated multiple times. Better to make it a function. # This is repeated multiple times. Better to make it a function.
pkg_rsync() { pkg_rsync() {
rsync -HKav --exclude etc -- "$tar_dir/$pkg_name/" "$KISS_ROOT/" rsync --chown=root:root -HKav --exclude etc -- \
"$tar_dir/$pkg_name/" "$KISS_ROOT/"
} }
# Install the package by using 'rsync' and overwrite any existing files # Install the package by using 'rsync' and overwrite any existing files
@ -784,7 +783,8 @@ pkg_install() {
# If '/etc/' exists in the package, install it but don't overwrite. # If '/etc/' exists in the package, install it but don't overwrite.
[ -d "$tar_dir/$pkg_name/etc" ] && [ -d "$tar_dir/$pkg_name/etc" ] &&
rsync -HKav --ignore-existing "$tar_dir/$pkg_name/etc" "$KISS_ROOT/" rsync --chown=root:root -HKav --ignore-existing \
"$tar_dir/$pkg_name/etc" "$KISS_ROOT/"
# Remove any leftover files if this is an upgrade. # Remove any leftover files if this is an upgrade.
[ "$old_manifest" ] && { [ "$old_manifest" ] && {