diff --git a/file-o-bot b/file-o-bot index 93d7bd1..2484035 100755 --- a/file-o-bot +++ b/file-o-bot @@ -45,8 +45,8 @@ fi RULE_LENGTH=$( jq '.movements | length' "${MOVEMENT_JSON_PATH}" ) for (( i=0; i<$RULE_LENGTH ; i++ )) do - SOURCE_PATH=$( jq -r ".movements[$i].sourcePath" "${MOVEMENT_JSON_PATH}" ) - DESTINATION_PATH=$( jq -r ".movements[$i].destinationPath" "${MOVEMENT_JSON_PATH}" ) + SOURCE_PATH=$( readlink -e $( jq -r ".movements[$i].sourcePath" "${MOVEMENT_JSON_PATH}" ) ) + DESTINATION_PATH=$( readlink -e $( jq -r ".movements[$i].destinationPath" "${MOVEMENT_JSON_PATH}" ) ) AMINS=$( jq -r ".movements[$i].amins" "${MOVEMENT_JSON_PATH}" ) start_movement "$SOURCE_PATH" "$DESTINATION_PATH" "$AMINS" done @@ -60,7 +60,13 @@ GREEN_PATH=$( readlink -f "${MAP_ROOT_DIRECTORY}"/green ) RED_PATH=$( readlink -f "${MAP_ROOT_DIRECTORY}"/red ) BLUE_PATH=$( readlink -f "${MAP_ROOT_DIRECTORY}"/blue ) if ! [[ -d ${GREEN_PATH} ]]; then - mkdir "${GREEN_PATH}" + mkdir -p "${GREEN_PATH}" +fi +if ! [[ -d ${RED_PATH} ]]; then + mkdir -p "${RED_PATH}" +fi +if ! [[ -d ${BLUE_PATH} ]]; then + mkdir -p "${BLUE_PATH}" fi # Compile storage paths from all the movements diff --git a/install.sh b/install.sh old mode 100644 new mode 100755 index 040e44b..5eeff91 --- a/install.sh +++ b/install.sh @@ -8,8 +8,14 @@ if [[ $ID == "debian" ]]; then apt-get install -y rsync jq parallel #elif [[ $ID == "centos" ]]; then # yum -y install jq rsync parallel +elif [[ $ID_LIKE == "arch" ]]; then + pacman -S parallel jq rsync +else + printf "Distro not found. Exiting." + exit 1 fi mkdir -p /etc/file-o-bot/config.d cp file-o-bot /usr/local/bin/file-o-bot -cp ./install-files/* /etc/file-o-bot/ +cp ./install-files/{default-config.ini,movement.json} /etc/file-o-bot/ +cp ./install-files/config.ini /etc/file-o-bot/config.d/