diff --git a/README.md b/README.md index f1fa984..05c02c7 100644 --- a/README.md +++ b/README.md @@ -5,15 +5,15 @@ Discussion Group at: https://groups.yahoo.com/neo/groups/k0usylink/info There are two ways to "install" DMRlink: -1) Use the Makefile +1) Use the mk-drmlink 2) Don't -The makefile will create a directory tree and copy all of the pertient files, making duplicates of some things so that each of the applications have a full set of all of the files they need, standalone. +The mk-dmrlink script will create a directory tree and copy all of the pertient files, making duplicates of some things so that each of the applications have a full set of all of the files they need, standalone. -Not using the makefile leaves the structure as it existis in the repo, which is fully functional. It trades the autonomy of the file tree and duplicates for a simpler installation, and the ability to sync to new versions more easily. +Not using the mk-dmrlink leaves the structure as it existis in the repo, which is fully functional. It trades the autonomy of the file tree and duplicates for a simpler installation, and the ability to sync to new versions more easily. -The one you use is up to you -- just please don't blindly go download it and type "make" becuase that's just what you always do. Please think about it. +The one you use is up to you -- just please don't blindly go download it and type "./mk-dmrlink" becuase that's just what you always do. Please think about it. ##PROJECT: Open Source IPSC Client. diff --git a/confbridge_rules-SAMPLE.py b/confbridge_rules_SAMPLE.py similarity index 98% rename from confbridge_rules-SAMPLE.py rename to confbridge_rules_SAMPLE.py index d0ccc29..9d791e3 100644 --- a/confbridge_rules-SAMPLE.py +++ b/confbridge_rules_SAMPLE.py @@ -9,7 +9,7 @@ each system must independently be activated on the bridge. The first level (e.g. "WORLDWIDE" or "STATEWIDE" in the examples) is the name of the conference bridge. This is any arbitrary ASCII text string you want to use. Under each conference bridge -definition are the following items -- one line for each HBSystem as defined in the main HBlink +definition are the following items -- one line for each HBSystem as defined in the main RMRlink configuration file. * SYSTEM - The name of the sytem as listed in the main dmrlink configuration file (e.g.dmrlink.cfg) @@ -45,4 +45,4 @@ BRIDGES = { if __name__ == '__main__': from pprint import pprint - pprint(BRIDGES) \ No newline at end of file + pprint(BRIDGES) diff --git a/dmrlink_SAMPLE.cfg b/dmrlink_SAMPLE.cfg index 90b6840..e9072b3 100644 --- a/dmrlink_SAMPLE.cfg +++ b/dmrlink_SAMPLE.cfg @@ -67,7 +67,7 @@ LOG_NAME: DMRlink # DOWNLOAD AND IMPORT SUBSCRIBER, PEER and TGID ALIASES # Ok, not the TGID, there's no master list I know of to download # This is intended as a facility for other applcations built on top of -# HBlink to use, and will NOT be used in HBlink directly. +# DMRlink to use, and will NOT be used in DMRlink directly. # STALE_DAYS is the number of days since the last download before we # download again. Don't be an ass and change this to less than a few days. [ALIASES] @@ -175,4 +175,4 @@ AUTH_KEY: 1A2B3C # Below not used for a Master # MASTER_IP: 1.2.3.4 # MASTER_PORT: 50000 -GROUP_HANGTIME: 5 \ No newline at end of file +GROUP_HANGTIME: 5 diff --git a/mk-dmrlink b/mk-dmrlink new file mode 100644 index 0000000..5d8059e --- /dev/null +++ b/mk-dmrlink @@ -0,0 +1,2 @@ +# place holder + diff --git a/mk_dmrlink b/mk_dmrlink deleted file mode 100755 index a0e4c91..0000000 --- a/mk_dmrlink +++ /dev/null @@ -1,125 +0,0 @@ -#! /bin/bash - -################################################# -# # -# Create directory structure for DMRlink # -# # -################################################# - -if [ ! -f /opt/dmrlink/get_ids.sh ]; then - apt-get install unzip -y - apt-get install python-twisted -y - -# To allow multiple instances of DMRlink to run -# You need multiple ipsc directories, dmrlink.py and dmrlink.cfg -# The needed files are copied to /opt/dmrlink - -# Make needed directories - mkdir -p /opt/dmrlink/ambe_audio/ipsc - mkdir -p /opt/dmrlink/bridge/ipsc - mkdir -p /opt/dmrlink/log/ipsc - mkdir -p /opt/dmrlink/playback/ipsc - mkdir -p /opt/dmrlink/play_group/ipsc - mkdir -p /opt/dmrlink/record/ipsc - mkdir -p /opt/dmrlink/rcm/ipsc - mkdir -p /opt/dmrlink/doc - mkdir -p /opt/dmrlink/samples - mkdir -p /var/log/dmrlink - -# bitstring install - cd /opt/dmrlink - wget https://pypi.python.org/packages/f3/e5/dfe4c49c93d174a5fd807ed307d3a3f38c6b3e140972945f81a5f5578ca7/bitstring-3.1.5.zip - unzip bitstring-3.1.5.zip - cd bitstring-3.1.5 - python setup.py install - -echo "Required programs installed, continuing" - -fi - -cd /opt/dmrlink - -# Put scripts in /opt/dmrlink -cp /srv/DMRlink/get_ids.sh /opt/dmrlink # should be linked to /etc/cron.daily -cp /srv/DMRlink/init.d/bridge /opt/dmrlink/rc.bridge - -# Put common files in /opt/dmrlink -cp /srv/DMRlink/subscriber_ids.csv /opt/dmrlink -cp /srv/DMRlink/talkgroup_ids.csv /opt/dmrlink -cp /srv/DMRlink/peer_ids.csv /opt/dmrlink -cp /srv/DMRlink/get_ids.sh /opt/dmrlink -cp /srv/DMRlink/RS129.py /opt/dmrlink -cp /srv/DMRlink/template.py /opt/dmrlink - -# Copy ipsc directory into each app directory -cp /srv/DMRlink/ipsc/* /opt/dmrlink/ambe_audio/ipsc -cp /srv/DMRlink/ipsc/* /opt/dmrlink/bridge/ipsc -cp /srv/DMRlink/ipsc/* /opt/dmrlink/log/ipsc -cp /srv/DMRlink/ipsc/* /opt/dmrlink/playback/ipsc -cp /srv/DMRlink/ipsc/* /opt/dmrlink/play_group/ipsc -cp /srv/DMRlink/ipsc/* /opt/dmrlink/record/ipsc -cp /srv/DMRlink/ipsc/* /opt/dmrlink/rcm/ipsc - -# Put the samples together for easy ref -cp /srv/DMRlink/bridge_rules_SAMPLE.py /opt/dmrlink/samples -cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/samples -cp /srv/DMRlink/known_bridges_SAMPLE.py /opt/dmrlink/samples -cp /srv/DMRlink/playback_config_SAMPLE.py /opt/dmrlink/samples -cp /srv/DMRlink/ambe_audio.cfg /opt/dmrlink/samples -cp /srv/DMRlink/sub_acl_SAMPLE.py /opt/dmrlink/samples - -# Put the doc together for easy ref -cp /srv/DMRlink/FAQ.md /opt/dmrlink/doc -cp /srv/DMRlink/internal_data_decode.txt /opt/dmrlink/doc -cp /srv/DMRlink/LICENSE.txt /opt/dmrlink/doc -cp /srv/DMRlink/README.md /opt/dmrlink/doc -cp /srv/DMRlink/requirements.txt /opt/dmrlink/doc -cp /srv/DMRlink/ambe_audio_commands.txt /opt/dmrlink/doc -cp /srv/DMRlink/internal_data_decode.txt /opt/dmrlink/doc -cp /srv/DMRlink/voice_burst_decoding.txt /opt/dmrlink/doc -cp /srv/DMRlink/voice_packets.txt /opt/dmrlink/doc - -# ambe_audio -cp /srv/DMRlink/ambe_audio.cfg /opt/dmrlink/ambe_audio/ -cp /srv/DMRlink/ambe_audio.py /opt/dmrlink/ambe_audio/ -cp /srv/DMRlink/dmrlink.py /opt/dmrlink/ambe_audio/ -cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/ambe_audio/ -cp /srv/DMRlink/template.bin /opt/dmrlink/ambe_audio/ -cp /srv/DMRlink/ambe_audio_commands.txt /opt/dmrlink/ambe_audio/ - -# Bridge app -cp /srv/DMRlink/bridge.py /opt/dmrlink/bridge/ -cp /srv/DMRlink/dmrlink.py /opt/dmrlink/bridge/ -cp /srv/DMRlink/bridge_rules_SAMPLE.py /opt/dmrlink/bridge/ -cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/bridge/ -cp /srv/DMRlink/known_bridges_SAMPLE.py /opt/dmrlink/bridge/ -cp /srv/DMRlink/sub_acl_SAMPLE.py /opt/dmrlink/bridge/ - -# Log app -cp /srv/DMRlink/log.py /opt/dmrlink/log/ -cp /srv/DMRlink/dmrlink.py /opt/dmrlink/log/ -cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/log/ - -# Playback (Parrot) -cp /srv/DMRlink/playback.py /opt/dmrlink/playback/ -cp /srv/DMRlink/dmrlink.py /opt/dmrlink/playback/ -cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/playback/ -cp /srv/DMRlink/playback_config_SAMPLE.py /opt/dmrlink/playback/ - -# Play Group app -cp /srv/DMRlink/play_group.py /opt/dmrlink/play_group/ -cp /srv/DMRlink/dmrlink.py /opt/dmrlink/play_group/ -cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/play_group/ - -# record app -cp /srv/DMRlink/record.py /opt/dmrlink/record/ -cp /srv/DMRlink/dmrlink.py /opt/dmrlink/record/ -cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/record/ - -# rcm app -cp /srv/DMRlink/rcm_db_log.py /opt/dmrlink/rcm/ -cp /srv/DMRlink/rcm.py /opt/dmrlink/rcm/ -cp /srv/DMRlink/dmrlink.py /opt/dmrlink/rcm/ -cp /srv/DMRlink/dmrlink_SAMPLE.cfg /opt/dmrlink/rcm/ -cp /srv/DMRlink/pickle_stat_reader.py /opt/dmrlink/rcm/ -