fix bug in queue selection

IBIC · Aug 10, 2017 · 6ebc4fa · 6ebc4fa
1 parent 1d73e4c
commit 6ebc4fa
Show file tree

Hide file tree

Showing 23 changed files with 9 additions and 38 deletions.
diff --git a/install_rmake b/install_rmake
@@ -0,0 +1,3 @@
+#!/bin/bash
+
+cp --verbose /mnt/home/tkmday/rmake/new/rmake /mnt/home/ibic/bin
diff --git a/option-organization.ods b/option-organization.ods
diff --git a/rmake b/rmake
@@ -1,7 +1,5 @@
 #!/bin/bash
 
-### USAGE
-
 # please set to 80 chars wide
 
 user=$(whoami)
@@ -42,8 +40,8 @@ usage() {
 				random name.
 		   -O   Save output/error files to qsub-[out|err] directories.
 		   -P   Append <date>_<time> to the jobid.
-		   -Q * Choose which queue. If left unspecified, queue will be chosen 
-		   		by qsub.	
+		   -Q * Choose which queue. If left unspecified, queue will be chosen
+		   		by qsub.
 		   -S *	Run qsub on these subjects only; if not set, run on all.
 		   -T *	Set the target for make.
 
@@ -72,7 +70,7 @@ then
     exit 1
 fi
 
-# Give a phony name, incase they run it without a target
+# Give a phony name, in case they run it without a target
 name=$(pwgen 5 1)
 
 # Find only in one and below
@@ -87,7 +85,7 @@ testmake=n
 setdate=n
 queue=
 
-while getopts ":abde:hijklmno:pqstvwz:CDHMN:OPS:T:" opt
+while getopts ":abde:hijklmno:pqstvwz:CDHMN:OPQ:S:T:" opt
 do
 	case $opt in
 
@@ -98,9 +96,9 @@ do
 	e) makeparam=$makeparam" --environment-overrides" ;;
 	h) make --help ; make_changes
 		exit 0 ;;
-	i) makeparam=$makeparam" --ignore errors" ;;
+	i) makeparam=$makeparam" --ignore-errors" ;;
 	j|l) echo "You can't parallize make while using SGE!"
-		exit 11 ;;
+		exit 1 ;;
 	k) makeparam=$makeparam" --keep-going" ;;
 	m) makeparam=$makeparam" --check-symlink-times" ;;
 	n) makeparam=$makeparam" --recon" ;;

diff --git a/test.aedeis/hexdump.txt b/test.aedeis/hexdump.txt
diff --git a/test.aedeis/sleep.txt b/test.aedeis/sleep.txt
diff --git a/test.eiraeh/hexdump.txt b/test.eiraeh/hexdump.txt
diff --git a/test.eiraeh/sleep.txt b/test.eiraeh/sleep.txt
diff --git a/test.eisoor/hexdump.txt b/test.eisoor/hexdump.txt
diff --git a/test.eisoor/sleep.txt b/test.eisoor/sleep.txt
diff --git a/test.laphee/hexdump.txt b/test.laphee/hexdump.txt
diff --git a/test.laphee/sleep.txt b/test.laphee/sleep.txt
diff --git a/test.lealoh/hexdump.txt b/test.lealoh/hexdump.txt
diff --git a/test.lealoh/sleep.txt b/test.lealoh/sleep.txt
diff --git a/test.lodiuf/hexdump.txt b/test.lodiuf/hexdump.txt
diff --git a/test.lodiuf/sleep.txt b/test.lodiuf/sleep.txt
diff --git a/test.oochah/hexdump.txt b/test.oochah/hexdump.txt
diff --git a/test.oochah/sleep.txt b/test.oochah/sleep.txt
diff --git a/test.oogeiw/hexdump.txt b/test.oogeiw/hexdump.txt
diff --git a/test.oogeiw/sleep.txt b/test.oogeiw/sleep.txt
diff --git a/test.theagh/hexdump.txt b/test.theagh/hexdump.txt
diff --git a/test.theagh/sleep.txt b/test.theagh/sleep.txt
diff --git a/test.veitoc/hexdump.txt b/test.veitoc/hexdump.txt
diff --git a/test.veitoc/sleep.txt b/test.veitoc/sleep.txt
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		#!/bin/bash

		cp --verbose /mnt/home/tkmday/rmake/new/rmake /mnt/home/ibic/bin