diff --git a/build.sh b/build.sh index a86f2ac7..aeb57f58 100755 --- a/build.sh +++ b/build.sh @@ -156,11 +156,6 @@ readonly M_PKGNAME_MACFUSE="${M_PKGBASENAME_MACFUSE}.pkg" readonly M_PKGBASENAME_OSXFUSE="OSXFUSE" readonly M_PKGNAME_OSXFUSE="${M_PKGBASENAME_OSXFUSE}.pkg" -# Redistribution package -readonly M_PKGID_REDIST="com.github.osxfuse.pkg.osxfuse" -readonly M_PKGBASENAME_REDIST="OSXFUSERedist" -readonly M_PKGNAME_REDIST="${M_PKGBASENAME_REDIST}.pkg" - readonly M_WANTSU="needs the Administrator password" readonly M_WARNING="*** Warning" @@ -1292,36 +1287,6 @@ __END_ENGINE_INSTALL rm -f "$md_scratch_dmg" # ignore any errors - m_log "building redistribution package" - - # Build redistribution package - # - - local md_redist_pkgsrc="$md_osxfuse_out/redistpkgsrc" - local md_redist_root="$md_osxfuse_out/redistroot" - - /bin/cp -R "$m_srcroot/packaging/installer/$M_PKGBASENAME_REDIST" "$md_redist_pkgsrc" - m_exit_on_error "cannot copy redistribution package source to '$md_redist_pkgsrc'." - /bin/cp "$md_osxfuse_out/$M_PKGNAME_OSXFUSE" "$md_redist_pkgsrc/Scripts/OSXFUSE.pkg" - m_exit_on_error "cannot copy OSXFUSE distribution package to '$md_redist_pkgsrc/Scripts'." - - mkdir -p "$md_redist_root" - m_exit_on_error "cannot make directory '$md_redist_root'." - - m_set_suprompt "to chown '$md_redist_root/'." - sudo -p "$m_suprompt" chown -R root:wheel "$md_redist_root/" - m_exit_on_error "cannot chown '$md_redist_root'." - - m_build_pkg "$m_release_full" "$md_redist_pkgsrc" "$md_redist_root" "$M_PKGID_REDIST" "$M_PKGNAME_REDIST" "$md_osxfuse_out" - m_exit_on_error "cannot create '$M_PKGNAME_REDIST'." - - m_set_suprompt "to remove directory '$md_redist_root'." - sudo -p "$m_suprompt" rm -rf "$md_redist_root" - # ignore any errors - - rm -rf "$md_redist_pkgsrc" - # ignore any errors - m_log "creating autoinstaller rules" # Make autoinstaller rules file diff --git a/packaging/installer/OSXFUSERedist/PackageInfo b/packaging/installer/OSXFUSERedist/PackageInfo deleted file mode 100644 index 841cc935..00000000 --- a/packaging/installer/OSXFUSERedist/PackageInfo +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/packaging/installer/OSXFUSERedist/Scripts/postinstall b/packaging/installer/OSXFUSERedist/Scripts/postinstall deleted file mode 100755 index 70dd12f4..00000000 --- a/packaging/installer/OSXFUSERedist/Scripts/postinstall +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -# Copyright 2011 Benjamin Fleischer - -readonly SUDO="/usr/bin/sudo" -readonly INSTALLER="/usr/sbin/installer" - -readonly SYSTEM_ROOT="$4" - -"$SUDO" "$INSTALLER" -dumplog -pkg "OSXFUSE.pkg" -target "$SYSTEM_ROOT" -exit $?