Commit 70d5b8c3 authored by Daniel Schulte's avatar Daniel Schulte
Browse files

Merge branch 'master' of

parents fa93bd80 1d30d470
PKG_LIST="cowsay fish get-flash-videos gnome haskell-platform java7-jdk imagemagick rxvt-unicode moc nethack-console scrot sl tmux vim xcowsay zsh zsh-doc texmaker gimp pidgin smplayer subversion git lftp inkscape"
MY_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
source #detect mountpoint
if [[ $UID -ne 0 ]]; then
echo "$0 must be run as root"
exit 1
source $MY_DIR/ #detect mountpoint
if [ -n $MPOINT ]; then
#check if we have root perms?
MERGE_DIR=$(mktemp -d)
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment