Skip to content

Commit f9e9826

Browse files
convert relative paths to absolute
1 parent 4a6e7d7 commit f9e9826

File tree

2 files changed

+28
-3
lines changed

2 files changed

+28
-3
lines changed

.gitignore

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,4 +70,7 @@ dev/
7070
junk/
7171

7272
#Thumbs.db on windows
73-
Thumbs.db
73+
Thumbs.db
74+
75+
#gif for twitter
76+
img/progress.gif

camToMP4.sh

Lines changed: 24 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ shopt -s extglob
44
progName="${0}"
55
scriptFolder="$( dirname ${BASH_SOURCE[0]} )"
66
scriptName="$( basename ${BASH_SOURCE[0]} )"
7+
PWD=$(pwd)
78
#available arguments
89
avArgs=(
910
-m --mv --move
@@ -134,6 +135,27 @@ then
134135
exit 1;
135136
fi
136137

138+
function convertToAbs() {
139+
if [ -z "$1" ]; then
140+
issueWarning "No path provided"
141+
exit 1;
142+
fi
143+
if [[ $1 = /* ]]; then
144+
if [ -d "$1" ]; then
145+
echo "$1";
146+
return 0;
147+
fi
148+
else
149+
local abs_path="$PWD/$1"
150+
if [ -d "$abs_path" ]; then
151+
echo "$abs_path";
152+
return 0;
153+
fi
154+
fi
155+
issueWarning "Path is not a dir or does not exist";
156+
exit 1;
157+
}
158+
137159
depsOK;
138160

139161
for (( i=0; i<"${#args[@]}"; ++i ))
@@ -221,7 +243,7 @@ do
221243
noProgress=
222244
;;
223245
!(--*|-*))
224-
trgtFolder="${args[$i]}"
246+
trgtFolder="$(convertToAbs "${args[$i]}")"
225247
;;
226248
?(-)-*)
227249
issueWarning "UNKNOWN OPTION %s" ${args[$i]}
@@ -233,7 +255,7 @@ done
233255

234256
issueInfo "CD %s" "${trgtFolder}"
235257
#do not do [[ -z "$dryRun" ]] &&, report if the folder does not exist
236-
cd "${trgtFolder}" || issueWarning "%s does not seem to exist" "${trgtFolder}";
258+
cd "${trgtFolder}" || { issueWarning "%s does not seem to exist" "${trgtFolder}" && exit 1; };
237259
j=0;
238260
k=$(find . -maxdepth 1 -mindepth 1 ! -name '.*' -type d | wc -l)
239261
for d in */; do

0 commit comments

Comments
 (0)