Too many things

crash2
Geoffrey Frogeye 2017-01-14 18:34:14 +01:00
parent a1ab569bfb
commit b8ead05322
6 changed files with 32 additions and 16 deletions

2
bashrc
View File

@ -111,8 +111,8 @@ alias fuck='eval $(thefuck $(fc -ln -1))'
alias FUCK='fuck'
# Command not found
[ -r /etc/profile.d/cnf.sh ] && . /etc/profile.d/cnf.sh
[ -r /usr/share/doc/pkgfile/command-not-found.bash ] && . /usr/share/doc/pkgfile/command-not-found.bash
[ -r /etc/profile.d/cnf.sh ] && . /etc/profile.d/cnf.sh
# Functions
function clean {

4
config/ycm_extra_conf.py Normal file
View File

@ -0,0 +1,4 @@
def FlagsForFile(filename, **kwargs):
return {
'flags': ['-Wall', '-Wextra', '-lm'],
}

View File

@ -79,13 +79,20 @@ function _machines-regenKey {
openssl genrsa -out $MACHINES_CONFIG/machines.key 4096
chmod 600 $MACHINES_CONFIG/machines.key
openssl req -key $MACHINES_CONFIG/machines.key -new -out $MACHINES_CONFIG/machines.csr
openssl x509 -req -in $MACHINES_CONFIG/machines.csr -signkey $MACHINES_CONFIG/machines.key -out $MACHINES_CONFIG/machines.crt
openssl x509 -req -days 1826 -in $MACHINES_CONFIG/machines.csr -signkey $MACHINES_CONFIG/machines.key -out $MACHINES_CONFIG/machines.crt
_machines-pubFromCrt
fi
}
function _machines-verifyCertificate {
if openssl verify $MACHINES_CONFIG/machines.crt | grep -v 'error18' | grep 'error' --quiet; then
echo "Invalid certificate"
exit 1
fi
}
function _machines-ensurePub {
if [ ! -f $MACHINES_CONFIG/machines.pub ]; then
if [ ! -f $MACHINES_CONFIG/machines.crt ]; then
CERT_FILE=$(mktemp)
echo "[INFO] Downloading certificate..."
_machines-api cert > $CERT_FILE
@ -93,14 +100,15 @@ function _machines-ensurePub {
prompt "Is this correct ?"
if [ $? == 1 ]; then
mv $CERT_FILE $MACHINES_CONFIG/machines.crt &> /dev/null
_machines-pubFromCrt
return 0
else
echo "Certificate rejected."
return 1
exit
exit 1
fi
fi
_machines-verifyCertificate
if [ ! -f $MACHINES_CONFIG/machines.pub ]; then
_machines-pubFromCrt
fi
}
# SSH ACCESS KEYS
@ -115,6 +123,7 @@ function _machines-signAkey { # network
}
function _machines-getAkey { # network
_machines-ensurePub
KEY_FILE=$(mktemp)
SIGN_FILE=$(mktemp)
_machines-api akey/$1 > $KEY_FILE
@ -275,9 +284,6 @@ function machines-setup {
fi
_machines-ensurePub
if [ $? != 0 ]; then
return 2
fi
# Variables
read -p 'Machine name? ' name

View File

@ -69,7 +69,7 @@ function replaceImg { # candidate original
else
echo "→ Candidate don't have the same bit map as original, skipping!"
fi
rm "$ppmc" "$ppmo"
rm "$ppmc" "$ppmo" "$c"
}
@ -98,7 +98,7 @@ do
rm "$prog"
fi
done <<< "$(find $dir -type f -iregex ".+.jpe?g$")"
done <<< "$(find "$dir" -type f -iregex ".+.jpe?g$")"
# PNG (requires optipng)
while read image
@ -112,7 +112,7 @@ do
replaceImg "$temp" "$image"
done <<< "$(find $dir -type f -iname "*.png")"
done <<< "$(find "$dir" -type f -iname "*.png")"
# SVG (requires svgo)
while read image
@ -121,15 +121,15 @@ do
temp=$(mktemp --suffix .svg)
cp "$image" "$temp"
svgo --quiet "$temp"
svgo --quiet --config $HOME/.scripts/svgo.yml "$temp"
echo "→ Optimize done"
replaceImg "$temp" "$image"
done <<< "$(find $dir -type f -iname "*.svg")"
done <<< "$(find "$dir" -type f -iname "*.svg")"
# GIT (requires git)
find $dir -type d -name .git -print0 | while IFS= read -r -d '' dir; do
find "$dir" -type d -name .git -print0 | while IFS= read -r -d '' dir; do
(cd "$dir"; git gc)
done

5
scripts/svgo.yml Normal file
View File

@ -0,0 +1,5 @@
plugins:
- mergePaths : false
- convertTransform : false
- cleanupNumericValues : false

1
vimrc
View File

@ -139,5 +139,6 @@ if has('persistent_undo')
endif
imap jk <Esc>
imap<Esc>
map <Enter> o<Esc>