Skip to content

Added blackPanther OS support to UI install #96

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
blackPantherOS wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Added blackPanther OS support to UI install #96

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8a2c248
Added blackPanther OS support
blackPantherOS Jun 19, 2021
3e23006
Support system based install different home installation as well
blackPantherOS Jun 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions data/mycroft-gui-core-loader.in
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,39 @@
#!/bin/sh
#!/usr/bin/sh

#If startup command is defined use it
if ! test -z "$MYCROFT_START_CMD"; then
$MYCROFT_START_CMD
# Rewritten for RPM installation support on blackPanther OS
# Charles K Barza * [email protected]

if [ "x86_64" = "$(uname -m)" ] ;then
LIB="/usr/lib64"
else
# Use default git install location
cd "${MYCROFT_CORE_DIR}" || exit
LIB="/usr/lib"
fi

if [[ $( pgrep -f "python3 (.*)-m mycroft.*${1}" ) ]] ; then
echo "MyCroft Already running on your system...."
else
if [ -x $LIB/mycroft-core/start-mycroft.sh ] ;then
cd $LIB/mycroft-core || exit
./start-mycroft.sh all
elif [ -x /usr/share/mycroft-core/start-mycroft.sh ] ;then
cd /usr/share/mycroft-core|| exit
./start-mycroft.sh all
elif [ -x $HOME/mycroft-core/start-mycroft.sh ];then
cd "$HOME/mycroft-core" || exit
./start-mycroft.sh all

else
FIND=$(find $HOME -maxdepth 5 -type f -name start-mycroft.sh -print -quit)
if [ -n "$FIND" ];then
SOURCE="${FIND}"
DIR="$( dirname "$SOURCE" )"
echo "Found MyCroft Install Here: $DIR"
cd $DIR || exit
./start-mycroft.sh all
else
echo "Missing Mycroft installation.... exiting"
fi
fi

fi

43 changes: 37 additions & 6 deletions data/mycroft-gui-core-stop.in
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,40 @@
#!/bin/sh
#If stop command is defined use it
if ! test -z "$MYCROFT_STOP_CMD"; then
$MYCROFT_STOP_CMD
#!/usr/bin/sh
# Rewritten for RPM installation support on blackPanther OS
# Charles K Barza * [email protected]

if [ "x86_64" = "$(uname -m)" ] ;then
LIB="/usr/lib64"
else
# Use default git install
cd "${MYCROFT_CORE_DIR}"|| exit
LIB="/usr/lib"
fi

if [[ $( pgrep -f "python3 (.*)-m mycroft.*${1}" ) ]] ; then
if [ -x $LIB/mycroft-core/stop-mycroft.sh ] ;then
cd $LIB/mycroft-core || exit
./stop-mycroft.sh
elif [ -x /usr/share/mycroft-core/stop-mycroft.sh ] ;then
cd /usr/share/mycroft-core|| exit
./stop-mycroft.sh
elif [ -x $HOME/mycroft-core/stop-mycroft.sh ];then
cd "$HOME/mycroft-core" || exit
./stop-mycroft.sh

else
FIND=$(find $HOME -maxdepth 5 -type f -name stop-mycroft.sh -print -quit)
if [ -n "$FIND" ];then
SOURCE="${FIND}"
DIR="$( dirname "$SOURCE" )"
echo "Found MyCroft Install Here: $DIR"
cd $DIR || exit
./stop-mycroft.sh
else
echo "Missing Mycroft installation.... exiting"
fi
fi

else

echo "Mycroft not running on your system...."

fi

33 changes: 30 additions & 3 deletions data/mycroft-gui-ptt-loader.in
100644 → 100755
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,31 @@
#!/bin/sh
#!/usr/bin/sh

# Rewritten for RPM installation support on blackPanther OS
# Charles K Barza * [email protected]

if [ "x86_64" = "$(uname -m)" ] ;then
LIB="/usr/lib64"
else
LIB="/usr/lib"
fi

if [ -x $LIB/mycroft-core/start-mycroft.sh ] ;then
source $LIB/mycroft-core/venv-activate.sh && mycroft_ptt_client
elif [ -x /usr/share/mycroft-core/start-mycroft.sh ] ;then
source /usr/share/mycroft-core/venv-activate.sh && mycroft_ptt_client
elif [ -x $HOME/mycroft-core/start-mycroft.sh ];then
source $HOME/mycroft-core/venv-activate.sh && mycroft_ptt_client

else
FIND=$(find $HOME -maxdepth 5 -type f -name start-mycroft.sh -print -quit)
if [ -n "$FIND" ];then
SOURCE="${FIND}"
DIR="$( dirname "$SOURCE" )"
echo "Found MyCroft Install Here: $DIR"
source $DIR/venv-activate.sh && mycroft_ptt_client
else
echo "Missing Mycroft installation.... exiting"
fi
fi


# Use default git install location
source ${MYCROFT_CORE_DIR}/venv-activate.sh && mycroft_ptt_client
29 changes: 23 additions & 6 deletions dev_setup.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,9 +30,10 @@ show_menus() {
echo "3. MANJARO/ARCH"
echo "4. ALPINE LINUX"
echo "5. openSUSE Leap 15.x"
echo "6. OTHERS"
echo "7. UPDATE INSTALLATION"
echo "8. EXIT"
echo "6. blackPanther OS 18.x"
echo "7. OTHERS"
echo "8. UPDATE INSTALLATION"
echo "9. EXIT"
}

read_options() {
Expand All @@ -45,9 +46,10 @@ read_options() {
3) manjaro ;;
4) alpine ;;
5) opensuse ;;
6) others ;;
7) updateinstall;;
8) exit 0;;
6) blackpantheros ;;
7) others ;;
8) updateinstall;;
9) exit 0;;
*) echo -e "${RED}Error...${STD}" && sleep 2
esac
}
Expand Down Expand Up @@ -109,6 +111,21 @@ opensuse() {

}

blackpantheros() {
echo "Starting Installation For blackPanther OS 18.x"
echo ""
echo "The development headers for the following packages will be installed: cmake extra-cmake-modules kio-devel kio-extras5 plasma-framework libqt5-qtwebsockets libqt5-qtwebview libqt5-qtdeclarative libqt5-qtmultimedia libQt5QuickControls2 libqt5-qtwebengine libqt5-qtbase ki18n kdbusaddons"
echo ""
echo "Please Enter Authentication For Installing System Dependencies"
if [ -x /usr/bin/sudo ];then
sudo installing cmake extra-cmake-modules kio-devel kioarchive-devel plasma-framework-devel qtwebsockets5-devel qt5webview-devel qt5qml-devel qt5multimedia-devel qt5quickcontrols2-devel qt5webengine-devel qtbase5-devel ki18n-devel kdbusaddons-devel
else
# self authenticaion
installing cmake extra-cmake-modules kio-devel kioarchive-devel plasma-framework-devel qtwebsockets5-devel qt5webview-devel qt5qml-devel qt5multimedia-devel qt5quickcontrols2-devel qt5webengine-devel qtbase5-devel ki18n-devel kdbusaddons-devel
fi
build_gui
}

updateinstall() {
echo "Pulling Latest Changes From Master"
git pull origin master
Expand Down