diff --git a/Desktop/README.md b/Desktop/README.md new file mode 100644 index 0000000..963bb41 --- /dev/null +++ b/Desktop/README.md @@ -0,0 +1 @@ +This is a folder Desktop apps files: .desktop, .xml, .png diff --git a/appendix b/appendix index ad67f9c..39653af 100644 --- a/appendix +++ b/appendix @@ -26,5 +26,9 @@ RUN yes | unminimize ENV MANPATH="${NB_PYTHON_PREFIX}/share/man:${MANPATH}" RUN mandb +# Copy Desktop files into ${REPO_DIR}/Desktop if they exist +ONBUILD RUN mkdir -p ${REPO_DIR}/Desktop && \ + if [ -d Desktop ]; then cp Desktop/* ${REPO_DIR}/Desktop/; fi + # Revert to default user USER ${NB_USER} diff --git a/mime/README.md b/mime/README.md deleted file mode 100644 index 411b857..0000000 --- a/mime/README.md +++ /dev/null @@ -1 +0,0 @@ -This is a folder for xml for Desktop apps. diff --git a/rocker.sh b/rocker.sh index 90171f3..13a8684 100644 --- a/rocker.sh +++ b/rocker.sh @@ -39,3 +39,9 @@ while IFS= read -r line; do eval "$cmd" # || echo ${cmd}" encountered an error, but continuing..." fi done < /rocker_scripts/original.Dockerfile + +# Install extra tex packages that are not installed by default +if command -v tlmgr &> /dev/null; then + echo "Installing texlive collection-latexrecommended..." + tlmgr install collection-latexrecommended +fi diff --git a/start b/start index b4c5c12..e145224 100644 --- a/start +++ b/start @@ -19,9 +19,13 @@ shopt -s nullglob # build-time. APPLICATIONS_DIR="${HOME}/.local/share/applications" DESKTOP_DIR="${HOME}/Desktop" +# Remove DESKTOP_DIR if it exists to avoid leftover files +if [ -d "${DESKTOP_DIR}" ]; then + rm -rf "${DESKTOP_DIR}" +fi mkdir -p "${APPLICATIONS_DIR}" mkdir -p "${DESKTOP_DIR}" -for desktop_file_path in ${REPO_DIR}/*.desktop; do +for desktop_file_path in ${REPO_DIR}/Desktop/*.desktop; do cp "${desktop_file_path}" "${APPLICATIONS_DIR}/." # Symlink application to desktop @@ -30,11 +34,11 @@ for desktop_file_path in ${REPO_DIR}/*.desktop; do done update-desktop-database "${APPLICATIONS_DIR}" -# Add MIME Type data from XML files in `mime/` dir to the MIME database. +# Add MIME Type data from XML files to the MIME database. MIME_DIR="${HOME}/.local/share/mime" MIME_PACKAGES_DIR="${MIME_DIR}/packages" mkdir -p "${MIME_PACKAGES_DIR}" -for mime_file_path in ${REPO_DIR}/mime/*.xml; do +for mime_file_path in ${REPO_DIR}/Desktop/*.xml; do cp "${mime_file_path}" "${MIME_PACKAGES_DIR}/." done update-mime-database "${MIME_DIR}"