From 86955df19926f5c4575da94577961e2148d68874 Mon Sep 17 00:00:00 2001 From: Mario1159 Date: Wed, 13 Sep 2023 07:52:33 -0300 Subject: [PATCH] Change to LF endings --- base/arch.Dockerfile | 66 ++++++++++++++++++++++---------------------- scripts/klayout | 22 +++++++-------- 2 files changed, 44 insertions(+), 44 deletions(-) diff --git a/base/arch.Dockerfile b/base/arch.Dockerfile index 1f0816b..aa832b4 100644 --- a/base/arch.Dockerfile +++ b/base/arch.Dockerfile @@ -1,34 +1,34 @@ -# OSIC Stacks - osicstack-base-arch -# Base image for OSIC Stacks -FROM greyltc/archlinux-aur:paru - -# Update packages -RUN pacman -Syuq --noconfirm - -# Install packages -RUN aur-install sudo git python python-pip python-pipx xz gnu-free-fonts vim ngspice gedit - -# Clean cache -RUN pacman -Scc - -# Add main user -RUN useradd -m designer -RUN echo "designer ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/designer - -# Install volare -USER designer -ENV PATH="${PATH}:/home/designer/.local/bin" -RUN pipx install volare -WORKDIR /home/designer - -# PDK Environment variables -ENV PDK_ROOT /home/designer/.volare -ENV USER designer - -# Add scripts -RUN mkdir -p .scripts -COPY --chown=designer:designer --chmod=755 scripts/klayout /home/designer/.scripts -ENV PATH="/home/designer/.scripts:${PATH}" - -# Initialize the enviroment keeping container alive +# OSIC Stacks - osicstack-base-arch +# Base image for OSIC Stacks +FROM greyltc/archlinux-aur:paru + +# Update packages +RUN pacman -Syuq --noconfirm + +# Install packages +RUN aur-install sudo git python python-pip python-pipx xz gnu-free-fonts vim ngspice gedit jupyter-notebook + +# Clean cache +RUN pacman -Scc + +# Add main user +RUN useradd -m designer +RUN echo "designer ALL=(ALL:ALL) NOPASSWD: ALL" | sudo tee /etc/sudoers.d/designer + +# Install volare +USER designer +ENV PATH="${PATH}:/home/designer/.local/bin" +RUN pipx install volare +WORKDIR /home/designer + +# PDK Environment variables +ENV PDK_ROOT /home/designer/.volare +ENV USER designer + +# Add scripts +RUN mkdir -p .scripts +COPY --chown=designer:designer --chmod=755 scripts/klayout /home/designer/.scripts +ENV PATH="/home/designer/.scripts:${PATH}" + +# Initialize the enviroment keeping container alive CMD ["sleep", "infinity"] \ No newline at end of file diff --git a/scripts/klayout b/scripts/klayout index 73c4342..dc5d39f 100644 --- a/scripts/klayout +++ b/scripts/klayout @@ -1,11 +1,11 @@ -#!/bin/bash -export KLAYOUT_HOME=$PDK_ROOT/$PDK/libs.tech/klayout -if [[ $PDK = gf180mcu* ]]; then - if [[ ! -d $KLAYOUT_HOME/pymacros/cells ]]; then - mv $KLAYOUT_HOME/pymacros/* $KLAYOUT_HOME/pymacros/cells | mkdir $KLAYOUT_HOME/pymacros/cells - fi - if [[ ! -f $KLAYOUT_HOME/pymacros/gf180mcu.lym ]]; then - mv $KLAYOUT_HOME/tech/gf180mcu.lym $KLAYOUT_HOME/pymacros - fi -fi -/bin/klayout $@ +#!/bin/bash +export KLAYOUT_HOME=$PDK_ROOT/$PDK/libs.tech/klayout +if [[ $PDK = gf180mcu* ]]; then + if [[ ! -d $KLAYOUT_HOME/pymacros/cells ]]; then + mv $KLAYOUT_HOME/pymacros/* $KLAYOUT_HOME/pymacros/cells | mkdir $KLAYOUT_HOME/pymacros/cells + fi + if [[ ! -f $KLAYOUT_HOME/pymacros/gf180mcu.lym ]]; then + mv $KLAYOUT_HOME/tech/gf180mcu.lym $KLAYOUT_HOME/pymacros + fi +fi +/bin/klayout $@