summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-09-15 11:34:02 -0700
committerJason Zaugg <jzaugg@gmail.com>2013-09-15 11:34:02 -0700
commit6a81025ab2f9a798c8b12eea8f8e7e4e83d3b6e4 (patch)
treee8d2fef512956d02ab00ab736f9c6f2c19659c76 /src
parentc2f7ce5cbbc3ccd086764e49c47e139786e0ab24 (diff)
parent2e5129630d2c7c833cb5455465d6c4440b8d58f2 (diff)
downloadscala-6a81025ab2f9a798c8b12eea8f8e7e4e83d3b6e4.tar.gz
scala-6a81025ab2f9a798c8b12eea8f8e7e4e83d3b6e4.tar.bz2
scala-6a81025ab2f9a798c8b12eea8f8e7e4e83d3b6e4.zip
Merge pull request #2946 from jinfu-leng/ticket/7844
SI-7844 Intellij setup.sh is not working for Ubuntu 12.04
Diffstat (limited to 'src')
-rwxr-xr-xsrc/intellij/setup.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/intellij/setup.sh b/src/intellij/setup.sh
index d0e1abeb96..bd324ba5bd 100755
--- a/src/intellij/setup.sh
+++ b/src/intellij/setup.sh
@@ -9,7 +9,7 @@ export BASE="$( cd "$( dirname "$0" )"/../.. && pwd )"
echo "About to delete .ipr and .iml files and replace with the .SAMPLE files. Press enter to continue or CTRL-C to cancel."
read
-(rm *.ipr *.iml 2>/dev/null)
+(rm -f *.ipr *.iml 2>/dev/null)
for f in $(ls "$SCRIPT_DIR"/*.SAMPLE); do
NEW_FILE=`echo $f | perl -pe 's/.SAMPLE//'`;