Browse Source

sde-config: skip symlinks in config/$config syncing

user/chris/test/arm
Alejandro Mery 13 years ago
parent
commit
9174ea8b0f
1 changed files with 8 additions and 3 deletions
  1. +8
    -3
      scripts/Config

+ 8
- 3
scripts/Config

@ -3,7 +3,7 @@
# This copyright note is auto-generated by ./scripts/Create-CopyPatch.
#
# Filename: scripts/Config
# Copyright (C) 2006 - 2010 The OpenSDE Project
# Copyright (C) 2006 - 2012 The OpenSDE Project
# Copyright (C) 2004 - 2006 The T2 SDE Project
# Copyright (C) 1998 - 2003 Clifford Wolf
#
@ -233,6 +233,9 @@ case "$returncode" in
# sync
# TODO: make this nicer, but still sudo-friendly
for x in config/$config/*; do
# skip symlinks
[ ! -L "$x" ] || continue
y="$cfgtmpdir/config/${x##*/}"
if [ ! -e "$y" ]; then
rm -f "$x"
@ -243,10 +246,12 @@ case "$returncode" in
fi
done
for y in "$cfgtmpdir/config"/* ; do 2> /dev/null
if [ -e "$y" ]; then
if [ -L "$y" ]; then
: # skip symlinks
elif [ -e "$y" ]; then
cp -a "$y" config/$config/
rm -f "$y"
fi
rm -f "$y"
done
rmdir $cfgtmpdir/config && rm -rf $cfgtmpdir/
echo "New config written to config/$config/*."

Loading…
Cancel
Save