Skip to content

Commit

Permalink
install.sh: Create all destination directories
Browse files Browse the repository at this point in the history
The explit list of destination directories to create is incomplete which
becomes apperent, if installed into a empty directoy with DESTDIR=...

Create any required directory implicitly.
  • Loading branch information
donald committed Nov 17, 2020
1 parent b679c3e commit 4a0cf1c
Showing 1 changed file with 4 additions and 13 deletions.
17 changes: 4 additions & 13 deletions install.sh
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,8 @@ function install_if()
shift 2

if need_update "$src" "$dst"; then
dir="$(dirname "$dst")"
test -d "$dir" || mkdir -p "$dir"
"$@" "$src" "$dst"
fi
register_installed_file "$dst"
Expand All @@ -73,7 +75,6 @@ function install_if()

function install_desktop_file()
{
test -d ${desktopdir} || mkdir -p ${desktopdir}
install_if "$1" "$2" $INSTALL_DATA
update-desktop-database ${desktopdir}
register_installed_file "$desktopdir/mimeinfo.cache"
Expand All @@ -97,6 +98,8 @@ function install_cron()
function install_symlink()
{
if [ "$(readlink "$2")" != "$1" ]; then
dir="$(dirname "$2")"
test -d "$dir" || mkdir -p "$dir"
ln -sfv "$1" "$2"
fi
register_installed_file "$2"
Expand All @@ -114,13 +117,6 @@ function postinstall()

umask 022;

mkdir -p "$DESTDIR$usr_bindir"
mkdir -p "$DESTDIR$usr_sbindir"
mkdir -p "$DESTDIR$systemdunitdir"
mkdir -p "$DESTDIR$usrlocal_bindir"
mkdir -p "$DESTDIR$udev_rulesdir"
mkdir -p "$DESTDIR$udev_helperdir"

install_exec make-automaps/make-automaps "$DESTDIR$usr_sbindir/make-automaps"
install_data misc_systemd_units/automount.service "$DESTDIR$systemdunitdir/automount.service"
install_data misc_systemd_units/dhcrelay.service "$DESTDIR$systemdunitdir/dhcrelay.service"
Expand Down Expand Up @@ -176,30 +172,25 @@ install_exec nfsdtop/nfsdtop "$DESTDIR$usr_sbindir/n
install_data serial-log/serial-log\@.service "$DESTDIR$systemdunitdir/serial-log@.service"
install_exec serial-log/serial-log "$DESTDIR$usr_exec_prefix/libexec/serial-log"
install_data misc_systemd_units/nfsd.service "$DESTDIR$systemdunitdir/nfsd.service"
mkdir -p "$DESTDIR$systemdunitdir/user@.service.d"
install_data misc_systemd_units/user@.service.d/depend-on-remote-homes.conf \
"$DESTDIR$systemdunitdir/user@.service.d/depend-on-remote-homes.conf"
mkdir -p "$DESTDIR$sysconfdir/systemd/logind.conf.d"
install_data misc_etc_files/systemd/logind.conf.d/disable_RemoveIPC.conf \
"$DESTDIR$sysconfdir/systemd/logind.conf.d/disable_RemoveIPC.conf"
install_data logrotate/logrotate.conf "$DESTDIR$sysconfdir/logrotate.conf"
install_data logrotate/logrotate.service "$DESTDIR$systemdunitdir/logrotate.service"
install_data logrotate/logrotate.timer "$DESTDIR$systemdunitdir/logrotate.timer"
install_data misc_systemd_units/network.service "$DESTDIR$systemdunitdir/network.service"
install_data misc_systemd_units/mxvlan.service "$DESTDIR$systemdunitdir/mxvlan.service"
mkdir -p "$DESTDIR$usr_prefix/share/applications"
install_data applications-defaults/defaults.list "$DESTDIR$usr_prefix/share/applications/defaults.list"
install_data misc_etc_files/modprobe.d/nfs_slotlimit.conf "$DESTDIR$sysconfdir/modprobe.d/nfs_slotlimit.conf"
install_data misc_etc_files/rsyslog.conf "$DESTDIR$sysconfdir/rsyslog.conf"
install_data crashkernel/crashkernel.service "$DESTDIR$systemdunitdir/crashkernel.service"
install_exec crashkernel/crash-recovery.sh "$DESTDIR$root_sbindir/crash-recovery.sh"
install_data misc_systemd_units/admin-sshd.service "$DESTDIR$systemdunitdir/admin-sshd.service"
install_exec checktrust/checktrust "$DESTDIR$usr_sbindir/checktrust"
mkdir -p "$DESTDIR$sysconfdir/xdg/lightdm/lightdm.conf.d"
install_data checktrust/lightdm-use-wrapper.conf "$DESTDIR$sysconfdir/xdg/lightdm/lightdm.conf.d/50-use-wrapper.conf"
install_exec checktrust/lightdm-greeter-wrapper "$DESTDIR$usr_exec_prefix/libexec/lightdm-greeter-wrapper"
install_exec checktrust/lightdm-show-trust-warning "$DESTDIR$usr_exec_prefix/libexec/lightdm-show-trust-warning"
mkdir -p "$DESTDIR$sysconfdir/issue.d/"
install_symlink /node/issue.d/notrust.issue "$DESTDIR$sysconfdir/issue.d/notrust.issue"
install_data checktrust/getty-checktrust.service "$DESTDIR$systemdunitdir/getty-checktrust.service"
install_exec checktrust/getty-checktrust "$DESTDIR$usr_exec_prefix/libexec/getty-checktrust"
Expand Down

0 comments on commit 4a0cf1c

Please sign in to comment.