2
0
Эх сурвалжийг харах

Dependencies moved to README, packages for Fedora

Arthur Yefimov 2 жил өмнө
parent
commit
e9c7bda764
2 өөрчлөгдсөн 102 нэмэгдсэн , 42 устгасан
  1. 50 16
      README.md
  2. 52 26
      install.sh

+ 50 - 16
README.md

@@ -28,7 +28,29 @@ Fob — это консольный компилятор языка Оберон
 
 ## Установка на Линукс
 
-1. Скачайте Free Oberon в виде архива tar.gz с сайта
+1. Зависимости:
+
+   Allegro (пакеты разработки), Git, GCC
+
+   На ОС Дебиан / Убунту / Линукс Минт и т. п.:
+   ```
+   sudo apt-get update
+   sudo apt-get install -y git gcc libc-dev liballegro5-dev
+   ```
+   или:
+   ```
+   su
+   apt-get update
+   apt-get install -y git gcc libc-dev liballegro5-dev
+   ```
+
+   На ОС Федора:
+
+   ```
+   sudo dnf install -y git gcc glibc-devel allegro5-devel allegro5-addon-image allegro5-addon-audio allegro5-addon-acodec allegro5-addon-dialog allegro5-devel allegro5-addon-image-devel allegro5-addon-audio-devel allegro5-addon-acodec-devel allegro5-addon-dialog-devel
+   ```
+
+2. Скачайте Free Oberon в виде архива tar.gz с сайта
    [free.oberon.org](https://free.oberon.org/download)
    и распакуйте его в домашнем каталоге (или в любом другом месте).
 
@@ -39,17 +61,12 @@ Fob — это консольный компилятор языка Оберон
    распакуйте архив в домашнем каталоге.
    Переименуйте каталог `FreeOberon-main` в `FreeOberon`.
 
-2. Находясь в распакованном каталоге, запустите `install.sh` с правами администратора.
-  ```
-  sudo ./install.sh
-  ```
-  или
+3. Находясь в распакованном каталоге, запустите `install.sh`.
   ```
-  su
   ./install.sh
   ```
 
-3. (по желанию) Допишите в конец файла `~/.bashrc` строчку:
+4. (по желанию) Допишите в конец файла `~/.bashrc` строчку:
   ```
   alias fo='cd ~/FreeOberon;./FreeOberon'
   ```
@@ -98,7 +115,29 @@ ______
 
 ## Install on Linux
 
-1. Download Free Oberon in tar.gz format from
+1. Dependencies:
+
+   Allegro (development packages), Git, GCC
+
+   On OS Debian / Ubuntu / Linux Minut and so on:
+   ```
+   sudo apt-get update
+   sudo apt-get install -y git gcc libc-dev liballegro5-dev
+   ```
+   or:
+   ```
+   su
+   apt-get update
+   apt-get install -y git gcc libc-dev liballegro5-dev
+   ```
+
+   On OS Fedora:
+
+   ```
+   sudo dnf install -y git gcc glibc-devel allegro5-devel allegro5-addon-image allegro5-addon-audio allegro5-addon-acodec allegro5-addon-dialog allegro5-devel allegro5-addon-image-devel allegro5-addon-audio-devel allegro5-addon-acodec-devel allegro5-addon-dialog-devel argro5-addon-dialog-devel
+   ```
+
+2. Download Free Oberon in tar.gz format from
    [free.oberon.org](https://free.oberon.org/en/download)
    and unpack it inside home directory (or in any other place).
 
@@ -109,17 +148,12 @@ ______
    unpack the archive inside your home directory.
    Rename directory `FreeOberon-main` to `FreeOberon`.
 
-2. Inside the unpacked directory, run `install.sh` with root privileges.
-  ```
-  sudo ./install.sh
-  ```
-  or
+3. Inside the unpacked directory, run `install.sh`.
   ```
-  su
   ./install.sh
   ```
 
-3. (optional) Append the following line to the end of file `~/.bashrc`:
+4. (optional) Append the following line to the end of file `~/.bashrc`:
   ```
   alias fo='cd ~/FreeOberon;./FreeOberon'
   ```

+ 52 - 26
install.sh

@@ -2,29 +2,55 @@
 
 echo "This script will install Free Oberon."
 
-echo "Installing Allegro5, Git and GCC..."
-sudo apt-get update
-sudo apt-get install -y git gcc libc-dev liballegro5-dev
-
-echo "======================="
-echo "Downloading Ofront+ if not exists..."
-# Only run git command if dot-git subdirectory exists
-[ -d ".git" ] && git submodule update --init
-
-echo "======================="
-echo "Building Ofront+..."
-cd Data/bin/OfrontPlus/Target/Linux_amd64/Bin
-./build
-cd ../../../../../..
-
-echo "======================="
-echo "Building Free Oberon..."
-cd src
-./make.sh
-cd ..
-
-echo "======================="
-echo "Done. Hopefully you can now run: ./FreeOberon"
-echo "Add this line to a file named ~/.bashrc"
-echo "to be able to use 'fob' as a command:"
-echo "export PATH=$PWD:\$PATH"
+echo "Free Oberon dependencies are:"
+echo " * Allegro5 - for the module Graph and the graphical IDE"
+echo " * Git - to download Ofront+"
+echo " * GCC - for Ofront+ to compile the generated C-code"
+echo
+echo "You can find the information on how to install the dependencies in the"
+echo "README.md file."
+echo
+echo "On OS Debian / Ubuntu / Linux Minut and so on:"
+echo "  sudo apt-get update"
+echo "  sudo apt-get install -y git gcc libc-dev liballegro5-dev"
+echo "or:"
+echo "  su"
+echo "  apt-get update"
+echo "  apt-get install -y git gcc libc-dev liballegro5-dev"
+echo
+echo "On OS Fedora:"
+echo "  sudo dnf install -y git gcc glibc-devel allegro5-devel allegro5-addon-image allegro5-addon-audio allegro5-addon-acodec allegro5-addon-dialog allegro5-devel allegro5-addon-image-devel allegro5-addon-audio-devel allegro5-addon-acodec-devel allegro5-addon-dialog-devel argro5-addon-dialog-devel"
+echo
+read -p "Are the dependencies installed? [y/n] " -n 1 -r
+echo
+if [[ $REPLY =~ ^[Yy]$ ]]; then
+
+  echo "======================="
+  echo "Downloading Ofront+ if not exists..."
+  # Only run git command if dot-git subdirectory exists
+  [ -d ".git" ] && git submodule update --init
+
+  echo "======================="
+  echo "Building Ofront+..."
+  cd Data/bin/OfrontPlus/Target/Linux_amd64/Bin
+  ./build
+  cd ../../../../../..
+
+  echo "======================="
+  echo "Building Free Oberon..."
+  cd src
+  ./make.sh
+  cd ..
+
+  echo "======================="
+
+  if [ -f "./FreeOberon" ]; then
+    echo "Free Oberon is installed. You can now run: ./FreeOberon"
+    echo "Add the following line to ~/.bashrc to use the command 'fob':"
+    echo "export PATH=$PWD:\$PATH"
+  else
+    echo "An error occurred while setting up Free Oberon."
+    echo "Please check your dependencies."
+  fi
+
+fi