Skip to content

Commit 933148f

Browse files
Merge branch 'topic/gtkada-doinstall' into 'master'
Various improvements in doinstall.sh script See merge request eng/ide/gtkada!37
2 parents f775734 + bc5ad23 commit 933148f

File tree

1 file changed

+3
-17
lines changed

1 file changed

+3
-17
lines changed

doinstall

Lines changed: 3 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -30,25 +30,11 @@ check_gtk_bin() {
3030
## Sets the variable $basedir
3131
ask_basedir() {
3232
clear
33-
default_dir="`type gnatmake 2>/dev/null| cut -d' ' -f3`"
34-
default_dir="`dirname \"$default_dir\" 2>/dev/null`"
35-
36-
if [ "$default_dir" != "" -a "$default_dir" != "." -a "$default_dir" != "/usr/bin" ]; then
37-
default_dir="`cd "$default_dir/.."; pwd`"
38-
cat <<EOF
39-
40-
GNAT has been found in $default_dir.
41-
Do you want to install GtkAda there too? Hit RETURN if yes or enter
42-
the name of the directory in which GtkAda should be installed:
43-
44-
EOF
45-
else
46-
default_dir=/opt/gtkada
47-
cat <<EOF
33+
default_dir=/opt/gtkada
34+
cat <<EOF
4835
Enter the name of the directory in which you would like to install GtkAda
4936
5037
EOF
51-
fi
5238

5339
while [ "$basedir" = "" ]; do
5440
printf "[$default_dir] "
@@ -119,7 +105,7 @@ install_binaries() {
119105

120106
echo "Copying the Gtk+ binaries"
121107

122-
cp -r "$gtk_bin_dir"/* "$basedir"
108+
cp -ri "$gtk_bin_dir"/* "$basedir"
123109

124110
echo "Setting up the environment"
125111
eval `"$basedir"/bin/gtkada-env.sh --print-only`

0 commit comments

Comments
 (0)