Commit 89551fd4 authored by nanahira's avatar nanahira

fix

parent 3e47b031
Pipeline #37591 failed with stages
in 1 minute and 36 seconds
...@@ -58,7 +58,7 @@ add_script_diff: ...@@ -58,7 +58,7 @@ add_script_diff:
echo "File $target already exists, skipping copy." echo "File $target already exists, skipping copy."
elif [ -f "$1" ]; then elif [ -f "$1" ]; then
echo "Copying $1 to $target" echo "Copying $1 to $target"
cp -rn "$1" ../script/ cp "$1" ../script/
else else
echo "File $1 not found, skipping." echo "File $1 not found, skipping."
fi fi
...@@ -68,7 +68,7 @@ add_script_diff: ...@@ -68,7 +68,7 @@ add_script_diff:
done done
for file in $(git diff --name-only --diff-filter=M FETCH_HEAD -- '*.lua'); do for file in $(git diff --name-only --diff-filter=M FETCH_HEAD -- '*.lua'); do
if [ -f "$file" ]; then if [ -f "$file" ]; then
current_time =$(git log -1 --format="%ct" HEAD -- "$file") current_time=$(git log -1 --format="%ct" HEAD -- "$file")
stable_time=$(git log -1 --format="%ct" FETCH_HEAD -- "$file") stable_time=$(git log -1 --format="%ct" FETCH_HEAD -- "$file")
if [ -n "$current_time" ] && [ -n "$current_time" ] && [ "$current_time" -lt "$stable_time" ]; then if [ -n "$current_time" ] && [ -n "$current_time" ] && [ "$current_time" -lt "$stable_time" ]; then
echo "File $file is older than stable/master, skipping copy." echo "File $file is older than stable/master, skipping copy."
......
Markdown is supported
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