...
 
Commits (9)
......@@ -8,15 +8,15 @@ function m_arrow() { echo -e " \033[1;33m➜\033[0m $@"; }
m_header "Install 3D-printing Environment"
CURA="Cura-3.3.1.AppImage"
CURA="Cura-3.4.1.AppImage"
wget -O ~/Downloads/$CURA "http://software.ultimaker.com/current/$CURA"
m_success "Downloaded $CURA"
chmod +x ~/Downloads/$CURA
m_success "Installed $CURA"
sudo apt-get install -y freecad
m_success "Installed FreeCAD"
sudo apt-get install -y freecad openscad
m_success "Installed FreeCAD and OpenSCAD"
m_success "Successfully installed 3D-printing Environment"
......@@ -20,7 +20,7 @@ m_success "Symlinked docker.io -> docker"
sudo usermod -a -G docker christoph
m_success "Added christoph to group docker"
wget -O ~/bin/docker-compose https://github.com/docker/compose/releases/download/1.21.2/docker-compose-`uname -s`-`uname -i`
wget -O ~/bin/docker-compose https://github.com/docker/compose/releases/download/1.21.2/docker-compose-`uname -s`-`uname -p`
chmod +x ~/bin/docker-compose
m_success "Installed docker-compose"
......
......@@ -10,7 +10,7 @@ m_header "Install Jekyll Environment"
m_header "Install ruby"
sudo apt-get update
sudo apt-get install -y ruby ruby-dev
sudo apt-get install -y ruby ruby-dev g++ make gcc
m_success "Installed ruby"
sudo apt-get install -y zlib1g-dev
......
......@@ -27,11 +27,16 @@
sync = !"git fetch origin; git rebase; git pull"
# Switch to a branch, creating it if necessary
go = "!f() { git checkout -b \"$1\" 2> /dev/null || git checkout \"$1\"; }; f"
# Create a new branch based on origin/master
nb = "!f() { git checkout -b $1 origin/master; }; f"
# Remove branches that have already been merged with master
# a.k.a. ‘delete merged’
dm = "!git branch --merged | grep -v '\\*' | xargs -n 1 git branch -d"
# get update from upstream and push to github/gitlab-fork
gh-update = "!f() { git checkout master && git reset --hard origin/master && git pull origin && git push github && git push gitlab && git push --tags gitlab; }; f"
# gerrit
push-draft = "!f() { git push origin HEAD:refs/drafts/$1; }; f"
push-gerrit = "!f() { git push origin HEAD:refs/for/$1; }; f"
[core]
# Treat spaces before tabs and all kinds of trailing whitespace as an error
......
......@@ -21,4 +21,6 @@ Host rhe
Host ka
HostName vwp4695.webpack.hosteurope.de
User wp11185451
Host kubeMaster
HostName 192.168.115.200
User pirate
......@@ -19,6 +19,7 @@ sudo add-apt-repository -y ppa:nextcloud-devs/client
################################################################################
sudo apt-get update
sudo apt-get install -y git git-svn vim screen sl htop bash-completion suckless-tools mmv tree net-tools \
exfat-fuse \
vlc \
scrot \
nextcloud-client \
......