self-hosted/joplin
1
0
Fork 0
mirror of https://github.com/laurent22/joplin.git synced 2024-12-21 09:38:01 +02:00
Code Issues Releases Activity

Linux: Fixes #2906 : Update install script to remove command -v check (#2926)

Browse Source 
* Linux: update install script to remove command -v check

* Formatting change

* spacing
This commit is contained in:
Caleb John 2020-05-09 04:23:42 -06:00 committed by GitHub
parent 488c0f1828
commit 24a90036b7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
Joplin_install_and_update.sh
View File

@ -83,21 +83,19 @@ fi
#----------------------------------------------------- #-----------------------------------------------------
showLogo showLogo
#-----------------------------------------------------
print "Checking architecture..." print "Checking architecture..."
# Architecture check ## uname actually gives more information than needed, but it contains all architectures (hardware and software)
if ! [[ -x "$(command -v uname)" ]] ; then ARCHITECTURE=$(uname -a || echo "NO CHECK")
print "${COLOR_YELLOW}WARNING: Can't get system architecture, skipping check${COLOR_RESET}"
else
## this actually gives more information than needed, but it contains all architectures (hardware and software)
ARCHITECTURE=$(uname -a)
if [[ $ARCHITECTURE =~ .*aarch.*|.*arm.* ]] ; then if [[ $ARCHITECTURE = "NO CHECK" ]] ; then
showHelp "Arm systems are not officially supported by Joplin, please search the forum (https://discourse.joplinapp.org/) for more information" print "${COLOR_YELLOW}WARNING: Can't get system architecture, skipping check${COLOR_RESET}"
exit 1 elif [[ $ARCHITECTURE =~ .*aarch.*|.*arm.* ]] ; then
elif [[ $ARCHITECTURE =~ .*i.86.* ]] ; then showHelp "Arm systems are not officially supported by Joplin, please search the forum (https://discourse.joplinapp.org/) for more information"
showHelp "32-bit systems are not supported by Joplin, please search the forum (https://discourse.joplinapp.org/) for more information" exit 1
exit 1 elif [[ $ARCHITECTURE =~ .*i386.*|.*i686.* ]] ; then
fi showHelp "32-bit systems are not supported by Joplin, please search the forum (https://discourse.joplinapp.org/) for more information"
exit 1
fi fi
#----------------------------------------------------- #-----------------------------------------------------