make git checkout possible on windows as well, eliminate special characters from filenames

This commit is contained in:
Cyryl Płotnicki-Chudyk 2016-08-04 16:08:47 +02:00
parent 4a0c349969
commit 8a80ad038a
2 changed files with 10 additions and 4 deletions

12
test
View file

@ -6,7 +6,8 @@ if [[ -z $DETECTED_OS ]]; then
fi fi
if [[ $DETECTED_OS =~ .*:.* ]]; then if [[ $DETECTED_OS =~ .*:.* ]]; then
DIR=`echo $DETECTED_OS | cut -d':' -f1` SYSTEM_NAME=`echo $DETECTED_OS | cut -d':' -f1`
SYSTEM_VERSION=`echo $DETECTED_OS | cut -d':' -f2`
else else
echo "please set DETECTED_OS to system:version" echo "please set DETECTED_OS to system:version"
exit 1 exit 1
@ -15,8 +16,13 @@ fi
INSIDER_ROOT_DIR=/root/temp/dotfiles/ INSIDER_ROOT_DIR=/root/temp/dotfiles/
CURRENT_DIR=`pwd` CURRENT_DIR=`pwd`
if [[ -d "$CURRENT_DIR/$DETECTED_OS" ]]; then SYSTEM_DIR="$SYSTEM_NAME/"
DIR=$DETECTED_OS SYSTEM_VERSION_DIR="$SYSTEM_NAME/$SYSTEM_VERSION/"
if [[ -d "$CURRENT_DIR/$SYSTEM_VERSION_DIR" ]]; then
DIR=$SYSTEM_VERSION_DIR
else
DIR=$SYSTEM_DIR
fi fi
docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DETECTED_OS $INSIDER_ROOT_DIR/$DIR/test_insider docker run -v $CURRENT_DIR:$INSIDER_ROOT_DIR $DETECTED_OS $INSIDER_ROOT_DIR/$DIR/test_insider

View file

@ -21,5 +21,5 @@ if [[ -z $NO_SYSTEMCTL ]]; then
fi fi
DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
DIR="$DIR/../" DIR="$DIR/../../"
DIR="$DIR" $DIR/common/configure_fresh_system DIR="$DIR" $DIR/common/configure_fresh_system