Fix many derps

This commit is contained in:
2020-02-05 18:23:34 -05:00
parent c59b8a0660
commit 383c2946ef

View File

@@ -102,7 +102,7 @@ function parse_input () {
parse_input "${@}" parse_input "${@}"
# Sanitize filename for unique container name # Sanitize filename for unique container name
CLEAN="${FILE_ACTIVE//_/}" && CLEAN="${CLEAN// /_}" && CLEAN="${FILE_ACTIVE//_/}" && CLEAN="${CLEAN// /}" &&
CLEAN="${CLEAN//[^a-zA-Z0-9_]/}" && CLEAN="${CLEAN,,}" CLEAN="${CLEAN//[^a-zA-Z0-9_]/}" && CLEAN="${CLEAN,,}"
# Allow container access to the pwd # Allow container access to the pwd
@@ -140,27 +140,27 @@ elif [[ $MODE == "1" ]]; then
if podman container exists "atom-${CLEAN}-persistent"; then if podman container exists "atom-${CLEAN}-persistent"; then
echo "Using existing container!" echo "Using existing container!"
podman exec "atom-${CLEAN}-persistent" \ podman exec "atom-${CLEAN}-persistent" \
/bin/bash -c "chmod 755 {FILE_ACTIVE} && {FILE_ACTIVE}" /bin/bash -c "chmod 755 ${FILE_ACTIVE} && ${FILE_ACTIVE}"
else else
if [[ -n $MASK_DIR ]]; then if [[ -n $MASK_DIR ]]; then
podman run \ podman run \
-it \ -it \
--systemd="${SYSTEMD}" \ --systemd="${SYSTEMD}" \
--name "atom-${CLEAN}-persistent" \ --name "atom-${CLEAN}-persistent" \
-v "{FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}" \ -v "${FILE_ACTIVE_PATH}:${FILE_ACTIVE_PATH}" \
-v "{FILE_ACTIVE_PATH}/${MASK_DIR}" \ -v "${FILE_ACTIVE_PATH}/${MASK_DIR}" \
-w "{FILE_ACTIVE_PATH}" \ -w "${FILE_ACTIVE_PATH}" \
"${IMAGE}" \ "${IMAGE}" \
/bin/bash -c "chmod 755 {FILE_ACTIVE} && {FILE_ACTIVE} ${OPTIONS}" /bin/bash -c "chmod 755 ${FILE_ACTIVE} && ${FILE_ACTIVE} ${OPTIONS}"
else else
podman run \ podman run \
-it \ -it \
--systemd="${SYSTEMD}" \ --systemd="${SYSTEMD}" \
--name "atom-${CLEAN}-persistent" \ --name "atom-${CLEAN}-persistent" \
-v "{FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}" \ -v "${FILE_ACTIVE_PATH}:${FILE_ACTIVE_PATH}" \
-w "{FILE_ACTIVE_PATH}" \ -w "${FILE_ACTIVE_PATH}" \
"${IMAGE}" \ "${IMAGE}" \
/bin/bash -c "chmod 755 {FILE_ACTIVE} && {FILE_ACTIVE} ${OPTIONS}" /bin/bash -c "chmod 755 ${FILE_ACTIVE} && ${FILE_ACTIVE} ${OPTIONS}"
fi fi
fi fi
# Recreate persistent container # Recreate persistent container
@@ -175,19 +175,19 @@ elif [[ $MODE == "2" ]]; then
-it \ -it \
--systemd="${SYSTEMD}" \ --systemd="${SYSTEMD}" \
--name "atom-${CLEAN}-persistent" \ --name "atom-${CLEAN}-persistent" \
-v "{FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}" \ -v "${FILE_ACTIVE_PATH}:${FILE_ACTIVE_PATH}" \
-v "{FILE_ACTIVE_PATH}/${MASK_DIR}" \ -v "${FILE_ACTIVE_PATH}/${MASK_DIR}" \
-w "{FILE_ACTIVE_PATH}" \ -w "${FILE_ACTIVE_PATH}" \
"${IMAGE}" \ "${IMAGE}" \
/bin/bash -c "chmod 755 {FILE_ACTIVE} && {FILE_ACTIVE} ${OPTIONS}" /bin/bash -c "chmod 755 ${FILE_ACTIVE} && ${FILE_ACTIVE} ${OPTIONS}"
else else
podman run \ podman run \
-it \ -it \
--systemd="${SYSTEMD}" \ --systemd="${SYSTEMD}" \
--name "atom-${CLEAN}-persistent" \ --name "atom-${CLEAN}-persistent" \
-v "{FILE_ACTIVE_PATH}:{FILE_ACTIVE_PATH}" \ -v "${FILE_ACTIVE_PATH}:${FILE_ACTIVE_PATH}" \
-w "{FILE_ACTIVE_PATH}" \ -w "${FILE_ACTIVE_PATH}" \
"${IMAGE}" \ "${IMAGE}" \
/bin/bash -c "chmod 755 {FILE_ACTIVE} && {FILE_ACTIVE} ${OPTIONS}" /bin/bash -c "chmod 755 ${FILE_ACTIVE} && ${FILE_ACTIVE} ${OPTIONS}"
fi fi
fi fi