summaryrefslogtreecommitdiff
path: root/odk/config/configure.pl
diff options
context:
space:
mode:
authorMichael Stahl <mstahl@redhat.com>2013-04-10 15:22:55 +0200
committerMichael Stahl <mstahl@redhat.com>2013-04-10 16:21:42 +0200
commit6f749e9595de50bdd8b7637155d3e40d94a45400 (patch)
tree30bc00b904edb27f040220964bde07a6b557470b /odk/config/configure.pl
parentd0857f0e57fb553b4ecb3b955273486dad002b90 (diff)
odk: remove duplicative setsdenv_unix.csh
Having to maintain only one of these seems easier, and likely nobody uses csh any more. Change-Id: Ia4ddb54d27999fbf17ceea0b8bd76e59a29b023d
Diffstat (limited to 'odk/config/configure.pl')
-rw-r--r--odk/config/configure.pl9
1 files changed, 1 insertions, 8 deletions
diff --git a/odk/config/configure.pl b/odk/config/configure.pl
index 8cd2a54978dd..9a460c89066b 100644
--- a/odk/config/configure.pl
+++ b/odk/config/configure.pl
@@ -514,12 +514,9 @@ else
$main::SDK_AUTO_DEPLOYMENT = "NO";
}
-prepareScriptFile("setsdkenv_unix.sh.in", "setsdkenv_unix.sh", 1);
+prepareScriptFile("setsdkenv_unix.sh.in", "setsdkenv_unix.sh");
chmod 0644, "$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.sh";
-prepareScriptFile("setsdkenv_unix.csh.in", "setsdkenv_unix.csh", 2);
-chmod 0644, "$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.csh";
-
print "\n";
print " ************************************************************************\n";
print " * ... your SDK environment has been prepared.\n";
@@ -527,7 +524,6 @@ print " * For each time you want to use this configured SDK environment, you\n";
print " * have to run the \"setsdkenv_unix\" script file!\n";
print " * Alternatively can you source one of the scripts\n";
print " * \"$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.sh\"\n";
-print " * \"$main::OO_SDK_CONFIG_HOME/$main::hostname/setsdkenv_unix.csh\"\n";
print " * to get an environment without starting a new shell.\n";
print " ************************************************************************\n\n";
@@ -776,9 +772,6 @@ sub prepareScriptFile()
{
my $inputFile = shift;
my $outputFile = shift;
- # shell mode 1 = sh
- # 2 = csh
- my $shellMode = shift;
if ( ! -d "$main::OO_SDK_CONFIG_HOME/$main::hostname" )
{